From 44b9aa168e58fc647a155ba02465cf7da9f1a477 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 9 Jul 2018 13:20:43 +0200 Subject: [PATCH] Polish "Improve description of Endpoint exclude" Closes gh-13619 --- .../autoconfigure/endpoint/jmx/JmxEndpointProperties.java | 2 +- .../src/main/asciidoc/appendix-application-properties.adoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointProperties.java index 6f39e124536..02faf967d30 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointProperties.java @@ -90,7 +90,7 @@ public class JmxEndpointProperties { private Set include = new LinkedHashSet<>(); /** - * Endpoint IDs that should be excluded. + * Endpoint IDs that should be excluded or '*' for all. */ private Set exclude = new LinkedHashSet<>(); diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 2ea353067ee..8d55d0b70d7 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -1169,13 +1169,13 @@ content into your application. Rather, pick only the properties that you need. # ENDPOINTS JMX CONFIGURATION ({sc-spring-boot-actuator-autoconfigure}/endpoint/jmx/JmxEndpointProperties.{sc-ext}[JmxEndpointProperties]) management.endpoints.jmx.domain=org.springframework.boot # Endpoints JMX domain name. Fallback to 'spring.jmx.default-domain' if set. management.endpoints.jmx.exposure.include=* # Endpoint IDs that should be included or '*' for all. - management.endpoints.jmx.exposure.exclude= # Endpoint IDs that should be excluded. + management.endpoints.jmx.exposure.exclude= # Endpoint IDs that should be excluded or '*' for all. management.endpoints.jmx.static-names= # Additional static properties to append to all ObjectNames of MBeans representing Endpoints. management.endpoints.jmx.unique-names=false # Whether to ensure that ObjectNames are modified in case of conflict. # ENDPOINTS WEB CONFIGURATION ({sc-spring-boot-actuator-autoconfigure}/endpoint/web/WebEndpointProperties.{sc-ext}[WebEndpointProperties]) management.endpoints.web.exposure.include=health,info # Endpoint IDs that should be included or '*' for all. - management.endpoints.web.exposure.exclude= # Endpoint IDs that should be excluded. + management.endpoints.web.exposure.exclude= # Endpoint IDs that should be excluded or '*' for all. management.endpoints.web.base-path=/actuator # Base path for Web endpoints. Relative to server.servlet.context-path or management.server.servlet.context-path if management.server.port is configured. management.endpoints.web.path-mapping= # Mapping between endpoint IDs and the path that should expose them.