Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-09-06 12:18:12 +02:00
parent 0e725543d5 ff8b8c55c6
commit 45ef926a90
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -194,12 +194,6 @@
"description": "Whether to enable files metrics.",
"defaultValue": true
},
{
"name": "management.metrics.binders.integration.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Spring Integration metrics.",
"defaultValue": true
},
{
"name": "management.metrics.binders.jvm.enabled",
"type": "java.lang.Boolean",

1
spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@@ -1374,7 +1374,6 @@ content into your application. Rather, pick only the properties that you need.
# METRICS
management.metrics.binders.files.enabled=true # Whether to enable files metrics.
management.metrics.binders.integration.enabled=true # Whether to enable Spring Integration metrics.
management.metrics.binders.jvm.enabled=true # Whether to enable JVM metrics.
management.metrics.binders.logback.enabled=true # Whether to enable Logback metrics.
management.metrics.binders.processor.enabled=true # Whether to enable processor metrics.