From fc09a23991d07e21540d5707cb3cdd2572915ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 12 Dec 2016 22:17:20 -0500 Subject: [PATCH 1/2] Add missing actuator metadata Health metadata for cassandra and couchbase is added. See gh-7632 --- ...itional-spring-configuration-metadata.json | 12 ++++++++ ...HealthIndicatorAutoConfigurationTests.java | 30 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json index c9a68e36517..b2320acd6b7 100644 --- a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -85,6 +85,18 @@ "type": "java.util.Map", "description": "Arbitrary properties to add to the info endpoint." }, + { + "name": "management.health.cassandra.enabled", + "type": "java.lang.Boolean", + "description": "Enable cassandra health check.", + "defaultValue": true + }, + { + "name": "management.health.couchbase.enabled", + "type": "java.lang.Boolean", + "description": "Enable couchbase health check.", + "defaultValue": true + }, { "name": "management.health.db.enabled", "type": "java.lang.Boolean", diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java index 937ab513a1c..c678ba66af9 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java @@ -457,6 +457,21 @@ public class HealthIndicatorAutoConfigurationTests { .isEqualTo(CassandraHealthIndicator.class); } + @Test + public void notCassandraHealthIndicator() throws Exception { + EnvironmentTestUtils.addEnvironment(this.context, + "management.health.diskspace.enabled:false", + "management.health.cassandra.enabled:false"); + this.context.register(CassandraConfiguration.class, + ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); + this.context.refresh(); + Map beans = this.context + .getBeansOfType(HealthIndicator.class); + assertThat(beans).hasSize(1); + assertThat(beans.values().iterator().next().getClass()) + .isEqualTo(ApplicationHealthIndicator.class); + } + @Test public void couchbaseHealthIndicator() throws Exception { EnvironmentTestUtils.addEnvironment(this.context, @@ -471,6 +486,21 @@ public class HealthIndicatorAutoConfigurationTests { .isEqualTo(CouchbaseHealthIndicator.class); } + @Test + public void notCouchbaseHealthIndicator() throws Exception { + EnvironmentTestUtils.addEnvironment(this.context, + "management.health.diskspace.enabled:false", + "management.health.couchbase.enabled:false"); + this.context.register(CouchbaseConfiguration.class, + ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); + this.context.refresh(); + Map beans = this.context + .getBeansOfType(HealthIndicator.class); + assertThat(beans.size()).isEqualTo(1); + assertThat(beans.values().iterator().next().getClass()) + .isEqualTo(ApplicationHealthIndicator.class); + } + @Configuration @EnableConfigurationProperties protected static class DataSourceConfig { From e5f2c58a7a7bcbd1510e2b3a7963ebf17e0965a8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Dec 2016 19:18:36 +0100 Subject: [PATCH 2/2] Polish Closes gh-7632 --- .../src/main/asciidoc/appendix-application-properties.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 6f9065ccde4..0d62c5472c6 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -1067,6 +1067,8 @@ content into your application; rather pick only the properties that you need. # HEALTH INDICATORS (previously health.*) management.health.db.enabled=true # Enable database health check. + management.health.cassandra.enabled=true # Enable cassandra health check. + management.health.couchbase.enabled=true # Enable couchbase health check. management.health.defaults.enabled=true # Enable default health indicators. management.health.diskspace.enabled=true # Enable disk space health check. management.health.diskspace.path= # Path used to compute the available disk space.