Skip to content

Commit ac4219b

Browse files
committed
Move management.jmx to management.endpoints.jmx
For consistency with #10053, this commit moves the JMX specific endpoint properties to `management.endpoints.jmx`.
1 parent 68fcea7 commit ac4219b

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/infrastructure/JmxEndpointExporterProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* @author Stephane Nicoll
2929
* @since 2.0.0
3030
*/
31-
@ConfigurationProperties("management.jmx")
31+
@ConfigurationProperties("management.endpoints.jmx")
3232
public class JmxEndpointExporterProperties {
3333

3434
/**

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,6 +1238,11 @@ content into your application; rather pick only the properties that you need.
12381238
management.endpoints.cors.exposed-headers= # Comma-separated list of headers to include in a response.
12391239
management.endpoints.cors.max-age=1800 # How long, in seconds, the response from a pre-flight request can be cached by clients.
12401240
1241+
# ENDPOINTS JMX CONFIGURATION ({sc-spring-boot-actuator}/autoconfigure/endpoint.infrastructure/JmxEndpointExporterProperties.{sc-ext}[JmxEndpointExporterProperties])
1242+
management.endpoints.jmx.domain=org.springframework.boot # Endpoints JMX domain name. Fallback to 'spring.jmx.default-domain' if set.
1243+
management.endpoints.jmx.static-names=false # Additional static properties to append to all ObjectNames of MBeans representing Endpoints.
1244+
management.endpoints.jmx.unique-names=false # Ensure that ObjectNames are modified in case of conflict.
1245+
12411246
# HEALTH INDICATORS
12421247
management.health.db.enabled=true # Enable database health check.
12431248
management.health.cassandra.enabled=true # Enable cassandra health check.
@@ -1267,11 +1272,6 @@ content into your application; rather pick only the properties that you need.
12671272
management.info.git.enabled=true # Enable git info.
12681273
management.info.git.mode=simple # Mode to use to expose git information.
12691274
1270-
# JMX ENDPOINT ({sc-spring-boot-actuator}/autoconfigure/endpoint.infrastructure/JmxEndpointExporterProperties.{sc-ext}[JmxEndpointExporterProperties])
1271-
management.jmx.domain=org.springframework.boot # Endpoints JMX domain name. Fallback to 'spring.jmx.default-domain' if set.
1272-
management.jmx.static-names=false # Additional static properties to append to all ObjectNames of MBeans representing Endpoints.
1273-
management.jmx.unique-names=false # Ensure that ObjectNames are modified in case of conflict.
1274-
12751275
# JOLOKIA ({sc-spring-boot-actuator}/autoconfigure/jolokia/JolokiaProperties.{sc-ext}[JolokiaProperties])
12761276
management.jolokia.config.*= # Jolokia settings. See the Jolokia manual for details.
12771277
management.jolokia.enabled=true # Enable Jolokia.

spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -742,16 +742,16 @@ The name of the MBean is usually generated from the `id` of the endpoint. For ex
742742
the `health` endpoint is exposed as `org.springframework.boot:type=Endpoint,name=Health`.
743743

744744
If your application contains more than one Spring `ApplicationContext` you may find that
745-
names clash. To solve this problem you can set the `management.jmx.unique-names` property
746-
to `true` so that MBean names are always unique.
745+
names clash. To solve this problem you can set the `management.endpoints.jmx.unique-names`
746+
property to `true` so that MBean names are always unique.
747747

748748
You can also customize the JMX domain under which endpoints are exposed. Here is an
749749
example `application.properties`:
750750

751751
[source,properties,indent=0]
752752
----
753-
management.jmx.domain=com.example.myapp
754-
management.jmx.unique-names=true
753+
management.endpoints.jmx.domain=com.example.myapp
754+
management.endpoints.jmx.unique-names=true
755755
----
756756

757757

0 commit comments

Comments
 (0)