Skip to content

Commit

Permalink
Disable Elasticsearch health check from actuator (#130)
Browse files Browse the repository at this point in the history
  • Loading branch information
tgianos committed May 30, 2017
1 parent c9d58e2 commit 9f7fbe1
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

# Used in documentation and for including the Gradle plugin
spring_boot_version=1.5.3.RELEASE
spring_cloud_version=Dalston.RELEASE
spring_cloud_version=Dalston.SR1
spring_platform_version=Brussels-SR2

## Override Spring Platform IO Versions

elasticsearch.version=1.7.1
elasticsearch.version=1.7.6
guava.version=19.0
guice.version=4.0
jersey.version=2.19
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
@Data
public class ElasticsearchProperties {

private boolean enabled = true;
private boolean enabled;
@NonNull
private Index index = new Index();
@NonNull
Expand Down
3 changes: 3 additions & 0 deletions metacat-main/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ dependencies {
compile("io.swagger:swagger-jersey2-jaxrs")
compile("org.springframework.boot:spring-boot-starter")
compile("org.springframework.boot:spring-boot-starter-actuator")
compile("org.springframework.boot:spring-boot-starter-hateoas")
compile("org.springframework.boot:spring-boot-starter-jersey")
compile("org.springframework.boot:spring-boot-starter-logging")
compile("org.springframework.boot:spring-boot-starter-tomcat")
Expand All @@ -68,6 +69,8 @@ dependencies {
runtime(project(":metacat-connector-redshift"))
runtime(project(":metacat-connector-s3"))

runtime("org.webjars:hal-browser")

/*******************************
* Test Dependencies
*******************************/
Expand Down
6 changes: 5 additions & 1 deletion metacat-main/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ metacat:
config:
location: /etc/catalog
elasticsearch:
enabled: true
cluster:
name: es_dpa
nodes: 100.67.79.200
Expand All @@ -30,6 +29,11 @@ metacat:

management:
context-path: /actuator
health:
elasticsearch:
enabled: false # This is needed for now as we're using a very out of date ES client that throws runtime errors
security:
enabled: false

netflix:
appinfo:
Expand Down

0 comments on commit 9f7fbe1

Please sign in to comment.