Skip to content

Commit a3f5aaa

Browse files
committed
Update the documentation following changes to Jolokia's auto-config
See gh-9843
1 parent 7e97495 commit a3f5aaa

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,8 +1118,6 @@ content into your application; rather pick only the properties that you need.
11181118
endpoints.info.enabled= # Enable the endpoint.
11191119
endpoints.info.id= # Endpoint identifier.
11201120
endpoints.info.path= # Endpoint path.
1121-
endpoints.jolokia.enabled=true # Enable Jolokia endpoint.
1122-
endpoints.jolokia.path=/jolokia # Endpoint URL path.
11231121
endpoints.liquibase.enabled= # Enable the endpoint.
11241122
endpoints.liquibase.id= # Endpoint identifier.
11251123
endpoints.logfile.enabled=true # Enable the endpoint.
@@ -1159,8 +1157,10 @@ content into your application; rather pick only the properties that you need.
11591157
endpoints.jmx.static-names= # Additional static properties to append to all ObjectNames of MBeans representing Endpoints.
11601158
endpoints.jmx.unique-names=false # Ensure that ObjectNames are modified in case of conflict.
11611159
1162-
# JOLOKIA ({sc-spring-boot-actuator}/autoconfigure/JolokiaProperties.{sc-ext}[JolokiaProperties])
1163-
jolokia.config.*= # See Jolokia manual
1160+
# JOLOKIA ({sc-spring-boot-actuator}/autoconfigure/jolokia/JolokiaProperties.{sc-ext}[JolokiaProperties])
1161+
management.jolokia.config.*= # Jolokia settings. See the Jolokia manual for details.
1162+
management.jolokia.enabled=true # Enable Jolokia.
1163+
management.jolokia.path=/jolokia # Path at which Jolokia will be available.
11641164
11651165
# MANAGEMENT HTTP SERVER ({sc-spring-boot-actuator}/autoconfigure/ManagementServerProperties.{sc-ext}[ManagementServerProperties])
11661166
management.add-application-context-header=false # Add the "X-Application-Context" HTTP header in each response.

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ If you are using Spring MVC, the following additional endpoints can also be used
125125
|`heapdump`
126126
|Returns a GZip compressed `hprof` heap dump file.
127127

128-
|`jolokia`
129-
|Exposes JMX beans over HTTP (when Jolokia is on the classpath).
130-
131128
|`logfile`
132129
|Returns the contents of the logfile (if `logging.file` or `logging.path` properties have
133130
been set). Supports the use of the HTTP `Range` header to retrieve part of the log file's
@@ -802,31 +799,31 @@ using Maven you would add the following:
802799
</dependency>
803800
----
804801

805-
Jolokia can then be accessed using `/jolokia` on your management HTTP server.
802+
Jolokia can then be accessed using `/application/jolokia` on your management HTTP server.
806803

807804

808805

809806
[[production-ready-customizing-jolokia]]
810807
==== Customizing Jolokia
811808
Jolokia has a number of settings that you would traditionally configure using servlet
812809
parameters. With Spring Boot you can use your `application.properties`, simply prefix the
813-
parameter with `jolokia.config.`:
810+
parameter with `management.jolokia.config.`:
814811

815812
[source,properties,indent=0]
816813
----
817-
jolokia.config.debug=true
814+
management.jolokia.config.debug=true
818815
----
819816

820817

821818

822819
[[production-ready-disabling-jolokia]]
823820
==== Disabling Jolokia
824821
If you are using Jolokia but you don't want Spring Boot to configure it, simply set the
825-
`endpoints.jolokia.enabled` property to `false`:
822+
`management.jolokia.enabled` property to `false`:
826823

827824
[source,properties,indent=0]
828825
----
829-
endpoints.jolokia.enabled=false
826+
management.jolokia.enabled=false
830827
----
831828

832829

0 commit comments

Comments
 (0)