Skip to content

S
spring-boot
Commit 31195273 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.1.x' into 2.2.x 

Closes gh-21097
parents 81268914 291165f0
Hide whitespace changes
Inline Side-by-side
Showing with 1887 additions and 1867 deletions
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View file @ 31195273
{ {
"properties": [ "properties": [
{
"name": "management.endpoint.configprops.keys-to-sanitize",
"defaultValue": [
"password",
"secret",
"key",
"token",
".*credentials.*",
"vcap_services",
"sun.java.command"
]
},
{
"name": "management.endpoint.env.keys-to-sanitize",
"defaultValue": [
"password",
"secret",
"key",
"token",
".*credentials.*",
"vcap_services",
"sun.java.command"
]
},
{
"name": "management.endpoint.health.show-details",
"defaultValue": "never"
},
{
"name": "management.endpoint.health.status.order",
"defaultValue": [
"DOWN",
"OUT_OF_SERVICE",
"UP",
"UNKNOWN"
]
},
{
"name": "management.endpoints.enabled-by-default",
"type": "java.lang.Boolean",
"description": "Whether to enable or disable all endpoints by default."
},
{
"name": "management.endpoints.jmx.domain",
"defaultValue": "org.springframework.boot"
},
{
"name": "management.endpoints.jmx.exposure.include",
"defaultValue": "*"
},
{
"name": "management.endpoints.web.exposure.include",
"defaultValue": [
"health",
"info"
]
},
{
"name": "info",
"type": "java.util.Map<java.lang.String,java.lang.Object>",
"description": "Arbitrary properties to add to the info endpoint."
},
{
"name": "management.cloudfoundry.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable extended Cloud Foundry actuator endpoints.",
"defaultValue": true
},
{
"name": "management.cloudfoundry.skip-ssl-validation",
"type": "java.lang.Boolean",
"description": "Whether to skip SSL verification for Cloud Foundry actuator endpoint security calls.",
"defaultValue": false
},
{
"name": "management.auditevents.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable storage of audit events.",
"defaultValue": true
},
{
"name": "management.health.cassandra.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Cassandra health check.",
"defaultValue": true
},
{
"name": "management.health.couchbase.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Couchbase health check.",
"defaultValue": true
},
{
"name": "management.health.db.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable database health check.",
"defaultValue": true
},
{
"name": "management.health.defaults.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable default health indicators.",
"defaultValue": true
},
{
"name": "management.health.diskspace.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable disk space health check.",
"defaultValue": true
},
{
"name": "management.health.elasticsearch.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Elasticsearch health check.",
"defaultValue": true
},
{
"name": "management.health.influxdb.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable InfluxDB health check.",
"defaultValue": true
},
{
"name": "management.health.jms.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable JMS health check.",
"defaultValue": true
},
{
"name": "management.health.ldap.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable LDAP health check.",
"defaultValue": true
},
{
"name": "management.health.mongo.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable MongoDB health check.",
"defaultValue": true
},
{
"name": "management.health.ping.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable ping health check.",
"defaultValue": true
},
{
"name": "management.health.rabbit.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable RabbitMQ health check.",
"defaultValue": true
},
{
"name": "management.health.redis.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Redis health check.",
"defaultValue": true
},
{
"name": "management.health.solr.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Solr health check.",
"defaultValue": true
},
{
"name": "management.health.status.order",
"defaultValue": [
"DOWN",
"OUT_OF_SERVICE",
"UP",
"UNKNOWN"
]
},
{
"name": "management.health.mail.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Mail health check.",
"defaultValue": true
},
{
"name": "management.health.neo4j.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Neo4j health check.",
"defaultValue": true
},
{
"name": "management.info.build.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable build info.",
"defaultValue": true
},
{
"name": "management.info.defaults.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable default info contributors.",
"defaultValue": true
},
{
"name": "management.info.env.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable environment info.",
"defaultValue": true
},
{
"name": "management.info.git.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable git info.",
"defaultValue": true
},
{
"name": "management.info.git.mode",
"defaultValue": "simple"
},
{
"name": "management.metrics.export.jmx.enabled",
"type": "java.lang.Boolean",
"description": "Whether exporting of metrics to JMX is enabled.",
"defaultValue": true
},
{
"name": "management.metrics.export.ganglia.addressing-mode",
"defaultValue": "multicast"
},
{
"name": "management.metrics.export.ganglia.duration-units",
"defaultValue": "milliseconds"
},
{
"name": "management.metrics.export.ganglia.rate-units",
"defaultValue": "seconds"
},
{
"name": "management.metrics.export.graphite.duration-units",
"defaultValue": "milliseconds"
},
{
"name": "management.metrics.export.graphite.protocol",
"defaultValue": "pickled"
},
{
"name": "management.metrics.export.graphite.rate-units",
"defaultValue": "seconds"
},
{
"name": "management.metrics.export.influx.consistency",
"defaultValue": "one"
},
{
"name": "management.metrics.export.prometheus.enabled",
"type": "java.lang.Boolean",
"description": "Whether exporting of metrics to Prometheus is enabled.",
"defaultValue": true
},
{
"name": "management.metrics.export.simple.enabled",
"type": "java.lang.Boolean",
"description": "Whether, in the absence of any other exporter, exporting of metrics to an in-memory backend is enabled.",
"defaultValue": true
},
{
"name": "management.metrics.export.simple.mode",
"defaultValue": "cumulative"
},
{
"name": "management.metrics.export.statsd.flavor",
"defaultValue": "datadog"
},
{
"name": "management.metrics.export.statsd.queue-size",
"defaultValue": 2147483647,
"deprecation": {
"level": "error"
}
},
{
"name": "management.metrics.web.client.request.autotime.enabled",
"description": "Whether to automatically time web client requests.",
"defaultValue": true
},
{
"name": "management.metrics.web.client.request.autotime.percentiles",
"description": "Computed non-aggregable percentiles to publish."
},
{
"name": "management.metrics.web.client.request.autotime.percentiles-histogram",
"description": "Whether percentile histograms should be published.",
"defaultValue": false
},
{
"name": "management.metrics.web.server.request.autotime.enabled",
"description": "Whether to automatically time web server requests.",
"defaultValue": true
},
{
"name": "management.metrics.web.server.request.autotime.percentiles",
"description": "Computed non-aggregable percentiles to publish."
},
{
"name": "management.metrics.web.server.request.autotime.percentiles-histogram",
"description": "Whether percentile histograms should be published.",
"defaultValue": false
},
{
"name": "management.server.ssl.ciphers",
"description": "Supported SSL ciphers."
},
{
"name": "management.server.ssl.client-auth",
"description": "Client authentication mode. Requires a trust store."
},
{
"name": "management.server.ssl.enabled",
"description": "Whether to enable SSL support.",
"defaultValue": true
},
{
"name": "management.server.ssl.enabled-protocols",
"description": "Enabled SSL protocols."
},
{
"name": "management.server.ssl.key-alias",
"description": "Alias that identifies the key in the key store."
},
{
"name": "management.server.ssl.key-password",
"description": "Password used to access the key in the key store."
},
{
"name": "management.server.ssl.key-store",
"description": "Path to the key store that holds the SSL certificate (typically a jks file)."
},
{
"name": "management.server.ssl.key-store-password",
"description": "Password used to access the key store."
},
{
"name": "management.server.ssl.key-store-provider",
"description": "Provider for the key store."
},
{
"name": "management.server.ssl.key-store-type",
"description": "Type of the key store."
},
{
"name": "management.server.ssl.protocol",
"description": "SSL protocol to use.",
"defaultValue": "TLS"
},
{
"name": "management.server.ssl.trust-store",
"description": "Trust store that holds SSL certificates."
},
{
"name": "management.server.ssl.trust-store-password",
"description": "Password used to access the trust store."
},
{
"name": "management.server.ssl.trust-store-provider",
"description": "Provider for the trust store."
},
{
"name": "management.server.ssl.trust-store-type",
"description": "Type of the trust store."
},
{
"name": "management.trace.http.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable HTTP request-response tracing.",
"defaultValue": true
},
{
"name": "management.trace.http.include",
"defaultValue": [
"request-headers",
"response-headers",
"cookies",
"errors"
]
},
{ {
"name": "endpoints.actuator.enabled", "name": "endpoints.actuator.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
...@@ -402,7 +23,8 @@ ...@@ -402,7 +23,8 @@
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
"description": "Mark if the endpoint exposes sensitive information.", "description": "Mark if the endpoint exposes sensitive information.",
"deprecation": { "deprecation": {
"reason": "The \"actuator\" endpoint is no longer available.","level": "error" "reason": "The \"actuator\" endpoint is no longer available.",
"level": "error"
} }
}, },
{ {
...@@ -432,14 +54,6 @@ ...@@ -432,14 +54,6 @@
"level": "error" "level": "error"
} }
}, },
{
"name": "endpoints.autoconfig.id",
"type": "java.lang.String",
"description": "Endpoint identifier. With HTTP monitoring the identifier of the endpoint is mapped\n to a URL (e.g. 'foo' is mapped to '/foo').",
"deprecation": {
"reason": "Endpoint identifier is no longer customizable.","level": "error"
}
},
{ {
"name": "endpoints.autoconfig.enabled", "name": "endpoints.autoconfig.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
...@@ -449,6 +63,15 @@ ...@@ -449,6 +63,15 @@
"level": "error" "level": "error"
} }
}, },
{
"name": "endpoints.autoconfig.id",
"type": "java.lang.String",
"description": "Endpoint identifier. With HTTP monitoring the identifier of the endpoint is mapped\n to a URL (e.g. 'foo' is mapped to '/foo').",
"deprecation": {
"reason": "Endpoint identifier is no longer customizable.",
"level": "error"
}
},
{ {
"name": "endpoints.autoconfig.path", "name": "endpoints.autoconfig.path",
"type": "java.lang.String", "type": "java.lang.String",
...@@ -745,7 +368,8 @@ ...@@ -745,7 +368,8 @@
"type": "java.lang.String", "type": "java.lang.String",
"description": "Endpoint identifier. With HTTP monitoring the identifier of the endpoint is mapped\n to a URL (e.g. 'foo' is mapped to '/foo').", "description": "Endpoint identifier. With HTTP monitoring the identifier of the endpoint is mapped\n to a URL (e.g. 'foo' is mapped to '/foo').",
"deprecation": { "deprecation": {
"reason": "Endpoint identifier is no longer customizable.","level": "error" "reason": "Endpoint identifier is no longer customizable.",
"level": "error"
} }
}, },
{ {
...@@ -808,7 +432,8 @@ ...@@ -808,7 +432,8 @@
"description": "Time to live for cached result, in milliseconds.", "description": "Time to live for cached result, in milliseconds.",
"defaultValue": 1000, "defaultValue": 1000,
"deprecation": { "deprecation": {
"replacement": "management.endpoint.health.cache.time-to-live","level": "error" "replacement": "management.endpoint.health.cache.time-to-live",
"level": "error"
} }
}, },
{ {
...@@ -844,7 +469,8 @@ ...@@ -844,7 +469,8 @@
"description": "Whether to enable hypermedia support for endpoints.", "description": "Whether to enable hypermedia support for endpoints.",
"defaultValue": false, "defaultValue": false,
"deprecation": { "deprecation": {
"reason": "Hypermedia support in the Actuator is no longer available.","level": "error" "reason": "Hypermedia support in the Actuator is no longer available.",
"level": "error"
} }
}, },
{ {
...@@ -1076,18 +702,10 @@ ...@@ -1076,18 +702,10 @@
}, },
{ {
"name": "endpoints.mappings.sensitive", "name": "endpoints.mappings.sensitive",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
"description": "Mark if the endpoint exposes sensitive information.", "description": "Mark if the endpoint exposes sensitive information.",
"deprecation": {
"reason": "Endpoint sensitive flag is no longer customizable as Spring Boot no longer provides a customizable security auto-configuration\n. Create or adapt your security configuration accordingly.",
"level": "error"
}
},
{
"name": "endpoints.metrics.filter.counter-submissions",
"description": "Submissions that should be made to the counter.",
"deprecation": { "deprecation": {
"reason": "Metrics support is now using Micrometer.", "reason": "Endpoint sensitive flag is no longer customizable as Spring Boot no longer provides a customizable security auto-configuration\n. Create or adapt your security configuration accordingly.",
"level": "error" "level": "error"
} }
}, },
...@@ -1100,6 +718,14 @@ ...@@ -1100,6 +718,14 @@
"level": "error" "level": "error"
} }
}, },
{
"name": "endpoints.metrics.filter.counter-submissions",
"description": "Submissions that should be made to the counter.",
"deprecation": {
"reason": "Metrics support is now using Micrometer.",
"level": "error"
}
},
{ {
"name": "endpoints.metrics.filter.enabled", "name": "endpoints.metrics.filter.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
...@@ -1190,6 +816,15 @@ ...@@ -1190,6 +816,15 @@
"level": "error" "level": "error"
} }
}, },
{
"name": "endpoints.trace.enabled",
"type": "java.lang.Boolean",
"description": "Enable the endpoint.",
"deprecation": {
"replacement": "management.endpoint.httptrace.enabled",
"level": "error"
}
},
{ {
"name": "endpoints.trace.filter.enabled", "name": "endpoints.trace.filter.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
...@@ -1201,87 +836,291 @@ ...@@ -1201,87 +836,291 @@
} }
}, },
{ {
"name": "endpoints.trace.enabled", "name": "endpoints.trace.id",
"type": "java.lang.String",
"description": "Endpoint identifier. With HTTP monitoring the identifier of the endpoint is mapped\n to a URL (e.g. 'foo' is mapped to '/foo').",
"deprecation": {
"reason": "Endpoint identifier is no longer customizable.",
"level": "error"
}
},
{
"name": "endpoints.trace.path",
"type": "java.lang.String",
"description": "Endpoint URL path.",
"deprecation": {
"replacement": "management.endpoints.web.path-mapping.httptrace",
"level": "error"
}
},
{
"name": "endpoints.trace.sensitive",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
"description": "Enable the endpoint.", "description": "Mark if the endpoint exposes sensitive information.",
"deprecation": {
"reason": "Endpoint sensitive flag is no longer customizable as Spring Boot no longer provides a customizable security auto-configuration\n. Create or adapt your security configuration accordingly.",
"level": "error"
}
},
{
"name": "info",
"type": "java.util.Map<java.lang.String,java.lang.Object>",
"description": "Arbitrary properties to add to the info endpoint."
},
{
"name": "jolokia.config",
"type": "java.util.Map<java.lang.String,java.lang.String>",
"description": "Jolokia settings. These are traditionally set using servlet parameters. Refer to\n the documentation of Jolokia for more details.",
"deprecation": {
"replacement": "management.endpoint.jolokia.config",
"level": "error"
}
},
{
"name": "management.add-application-context-header",
"type": "java.lang.Boolean",
"description": "Add the \"X-Application-Context\" HTTP header in each response.",
"defaultValue": true,
"deprecation": {
"replacement": "management.server.add-application-context-header",
"level": "error"
}
},
{
"name": "management.address",
"type": "java.net.InetAddress",
"description": "Network address that the management endpoints should bind to.",
"deprecation": {
"replacement": "management.server.address",
"level": "error"
}
},
{
"name": "management.auditevents.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable storage of audit events.",
"defaultValue": true
},
{
"name": "management.cloudfoundry.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable extended Cloud Foundry actuator endpoints.",
"defaultValue": true
},
{
"name": "management.cloudfoundry.skip-ssl-validation",
"type": "java.lang.Boolean",
"description": "Whether to skip SSL verification for Cloud Foundry actuator endpoint security calls.",
"defaultValue": false
},
{
"name": "management.context-path",
"type": "java.lang.String",
"description": "Management endpoint context-path.",
"defaultValue": "",
"deprecation": {
"replacement": "management.server.servlet.context-path",
"level": "error"
}
},
{
"name": "management.endpoint.configprops.keys-to-sanitize",
"defaultValue": [
"password",
"secret",
"key",
"token",
".*credentials.*",
"vcap_services",
"sun.java.command"
]
},
{
"name": "management.endpoint.env.keys-to-sanitize",
"defaultValue": [
"password",
"secret",
"key",
"token",
".*credentials.*",
"vcap_services",
"sun.java.command"
]
},
{
"name": "management.endpoint.health.show-details",
"defaultValue": "never"
},
{
"name": "management.endpoint.health.status.order",
"defaultValue": [
"DOWN",
"OUT_OF_SERVICE",
"UP",
"UNKNOWN"
]
},
{
"name": "management.endpoints.enabled-by-default",
"type": "java.lang.Boolean",
"description": "Whether to enable or disable all endpoints by default."
},
{
"name": "management.endpoints.jmx.domain",
"defaultValue": "org.springframework.boot"
},
{
"name": "management.endpoints.jmx.exposure.include",
"defaultValue": "*"
},
{
"name": "management.endpoints.web.exposure.include",
"defaultValue": [
"health",
"info"
]
},
{
"name": "management.health.cassandra.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Cassandra health check.",
"defaultValue": true
},
{
"name": "management.health.couchbase.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Couchbase health check.",
"defaultValue": true
},
{
"name": "management.health.couchbase.timeout",
"type": "java.time.Duration",
"description": "Timeout for getting the Bucket information from the server.",
"defaultValue": "1000ms",
"deprecation": { "deprecation": {
"replacement": "management.endpoint.httptrace.enabled",
"level": "error" "level": "error"
} }
}, },
{ {
"name": "endpoints.trace.id", "name": "management.health.db.enabled",
"type": "java.lang.String", "type": "java.lang.Boolean",
"description": "Endpoint identifier. With HTTP monitoring the identifier of the endpoint is mapped\n to a URL (e.g. 'foo' is mapped to '/foo').", "description": "Whether to enable database health check.",
"deprecation": { "defaultValue": true
"reason": "Endpoint identifier is no longer customizable.", },
"level": "error" {
} "name": "management.health.defaults.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable default health indicators.",
"defaultValue": true
},
{
"name": "management.health.diskspace.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable disk space health check.",
"defaultValue": true
},
{
"name": "management.health.elasticsearch.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Elasticsearch health check.",
"defaultValue": true
},
{
"name": "management.health.influxdb.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable InfluxDB health check.",
"defaultValue": true
},
{
"name": "management.health.jms.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable JMS health check.",
"defaultValue": true
},
{
"name": "management.health.ldap.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable LDAP health check.",
"defaultValue": true
},
{
"name": "management.health.mail.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Mail health check.",
"defaultValue": true
},
{
"name": "management.health.mongo.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable MongoDB health check.",
"defaultValue": true
},
{
"name": "management.health.neo4j.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Neo4j health check.",
"defaultValue": true
},
{
"name": "management.health.ping.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable ping health check.",
"defaultValue": true
},
{
"name": "management.health.rabbit.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable RabbitMQ health check.",
"defaultValue": true
},
{
"name": "management.health.redis.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Redis health check.",
"defaultValue": true
}, },
{ {
"name": "endpoints.trace.path", "name": "management.health.solr.enabled",
"type": "java.lang.String", "type": "java.lang.Boolean",
"description": "Endpoint URL path.", "description": "Whether to enable Solr health check.",
"deprecation": { "defaultValue": true
"replacement": "management.endpoints.web.path-mapping.httptrace",
"level": "error"
}
}, },
{ {
"name": "endpoints.trace.sensitive", "name": "management.health.status.order",
"type": "java.lang.Boolean", "defaultValue": [
"description": "Mark if the endpoint exposes sensitive information.", "DOWN",
"deprecation": { "OUT_OF_SERVICE",
"reason": "Endpoint sensitive flag is no longer customizable as Spring Boot no longer provides a customizable security auto-configuration\n. Create or adapt your security configuration accordingly.", "UP",
"level": "error" "UNKNOWN"
} ]
}, },
{ {
"name": "jolokia.config", "name": "management.info.build.enabled",
"type": "java.util.Map<java.lang.String,java.lang.String>", "type": "java.lang.Boolean",
"description": "Jolokia settings. These are traditionally set using servlet parameters. Refer to\n the documentation of Jolokia for more details.", "description": "Whether to enable build info.",
"deprecation": { "defaultValue": true
"replacement": "management.endpoint.jolokia.config",
"level": "error"
}
}, },
{ {
"name": "management.add-application-context-header", "name": "management.info.defaults.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
"description": "Add the \"X-Application-Context\" HTTP header in each response.", "description": "Whether to enable default info contributors.",
"defaultValue": true, "defaultValue": true
"deprecation": {
"replacement": "management.server.add-application-context-header",
"level": "error"
}
}, },
{ {
"name": "management.address", "name": "management.info.env.enabled",
"type": "java.net.InetAddress", "type": "java.lang.Boolean",
"description": "Network address that the management endpoints should bind to.", "description": "Whether to enable environment info.",
"deprecation": { "defaultValue": true
"replacement": "management.server.address",
"level": "error"
}
}, },
{ {
"name": "management.context-path", "name": "management.info.git.enabled",
"type": "java.lang.String", "type": "java.lang.Boolean",
"description": "Management endpoint context-path.", "description": "Whether to enable git info.",
"defaultValue": "", "defaultValue": true
"deprecation": {
"replacement": "management.server.servlet.context-path",
"level": "error"
}
}, },
{ {
"name": "management.health.couchbase.timeout", "name": "management.info.git.mode",
"type": "java.time.Duration", "defaultValue": "simple"
"description": "Timeout for getting the Bucket information from the server.",
"defaultValue": "1000ms",
"deprecation": {
"level": "error"
}
}, },
{ {
"name": "management.metrics.binders.files.enabled", "name": "management.metrics.binders.files.enabled",
...@@ -1336,6 +1175,95 @@ ...@@ -1336,6 +1175,95 @@
"reason": "Instead, filter 'process.uptime' and 'process.start.time' metrics." "reason": "Instead, filter 'process.uptime' and 'process.start.time' metrics."
} }
}, },
{
"name": "management.metrics.export.ganglia.addressing-mode",
"defaultValue": "multicast"
},
{
"name": "management.metrics.export.ganglia.duration-units",
"defaultValue": "milliseconds"
},
{
"name": "management.metrics.export.ganglia.rate-units",
"defaultValue": "seconds"
},
{
"name": "management.metrics.export.graphite.duration-units",
"defaultValue": "milliseconds"
},
{
"name": "management.metrics.export.graphite.protocol",
"defaultValue": "pickled"
},
{
"name": "management.metrics.export.graphite.rate-units",
"defaultValue": "seconds"
},
{
"name": "management.metrics.export.influx.consistency",
"defaultValue": "one"
},
{
"name": "management.metrics.export.jmx.enabled",
"type": "java.lang.Boolean",
"description": "Whether exporting of metrics to JMX is enabled.",
"defaultValue": true
},
{
"name": "management.metrics.export.prometheus.enabled",
"type": "java.lang.Boolean",
"description": "Whether exporting of metrics to Prometheus is enabled.",
"defaultValue": true
},
{
"name": "management.metrics.export.simple.enabled",
"type": "java.lang.Boolean",
"description": "Whether, in the absence of any other exporter, exporting of metrics to an in-memory backend is enabled.",
"defaultValue": true
},
{
"name": "management.metrics.export.simple.mode",
"defaultValue": "cumulative"
},
{
"name": "management.metrics.export.statsd.flavor",
"defaultValue": "datadog"
},
{
"name": "management.metrics.export.statsd.queue-size",
"defaultValue": 2147483647,
"deprecation": {
"level": "error"
}
},
{
"name": "management.metrics.web.client.request.autotime.enabled",
"description": "Whether to automatically time web client requests.",
"defaultValue": true
},
{
"name": "management.metrics.web.client.request.autotime.percentiles",
"description": "Computed non-aggregable percentiles to publish."
},
{
"name": "management.metrics.web.client.request.autotime.percentiles-histogram",
"description": "Whether percentile histograms should be published.",
"defaultValue": false
},
{
"name": "management.metrics.web.server.request.autotime.enabled",
"description": "Whether to automatically time web server requests.",
"defaultValue": true
},
{
"name": "management.metrics.web.server.request.autotime.percentiles",
"description": "Computed non-aggregable percentiles to publish."
},
{
"name": "management.metrics.web.server.request.autotime.percentiles-histogram",
"description": "Whether percentile histograms should be published.",
"defaultValue": false
},
{ {
"name": "management.port", "name": "management.port",
"type": "java.lang.Integer", "type": "java.lang.Integer",
...@@ -1379,6 +1307,68 @@ ...@@ -1379,6 +1307,68 @@
"description": "Add the \"X-Application-Context\" HTTP header in each response.", "description": "Add the \"X-Application-Context\" HTTP header in each response.",
"defaultValue": false "defaultValue": false
}, },
{
"name": "management.server.ssl.ciphers",
"description": "Supported SSL ciphers."
},
{
"name": "management.server.ssl.client-auth",
"description": "Client authentication mode. Requires a trust store."
},
{
"name": "management.server.ssl.enabled",
"description": "Whether to enable SSL support.",
"defaultValue": true
},
{
"name": "management.server.ssl.enabled-protocols",
"description": "Enabled SSL protocols."
},
{
"name": "management.server.ssl.key-alias",
"description": "Alias that identifies the key in the key store."
},
{
"name": "management.server.ssl.key-password",
"description": "Password used to access the key in the key store."
},
{
"name": "management.server.ssl.key-store",
"description": "Path to the key store that holds the SSL certificate (typically a jks file)."
},
{
"name": "management.server.ssl.key-store-password",
"description": "Password used to access the key store."
},
{
"name": "management.server.ssl.key-store-provider",
"description": "Provider for the key store."
},
{
"name": "management.server.ssl.key-store-type",
"description": "Type of the key store."
},
{
"name": "management.server.ssl.protocol",
"description": "SSL protocol to use.",
"defaultValue": "TLS"
},
{
"name": "management.server.ssl.trust-store",
"description": "Trust store that holds SSL certificates."
},
{
"name": "management.server.ssl.trust-store-password",
"description": "Password used to access the trust store."
},
{
"name": "management.server.ssl.trust-store-provider",
"description": "Provider for the trust store."
},
{
"name": "management.server.ssl.trust-store-type",
"description": "Type of the trust store."
},
{ {
"name": "management.shell.auth.jaas.domain", "name": "management.shell.auth.jaas.domain",
"type": "java.lang.String", "type": "java.lang.String",
...@@ -1563,7 +1553,8 @@ ...@@ -1563,7 +1553,8 @@
"description": "Telnet port.", "description": "Telnet port.",
"defaultValue": 5000, "defaultValue": 5000,
"deprecation": { "deprecation": {
"reason": "CRaSH support is no longer available.","level": "error" "reason": "CRaSH support is no longer available.",
"level": "error"
} }
}, },
{ {
...@@ -1685,6 +1676,21 @@ ...@@ -1685,6 +1676,21 @@
"level": "error" "level": "error"
} }
}, },
{
"name": "management.trace.http.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable HTTP request-response tracing.",
"defaultValue": true
},
{
"name": "management.trace.http.include",
"defaultValue": [
"request-headers",
"response-headers",
"cookies",
"errors"
]
},
{ {
"name": "management.trace.include", "name": "management.trace.include",
"deprecation": { "deprecation": {
......
spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View file @ 31195273
{ {
"properties": [ "properties": [
{
"name": "spring.devtools.add-properties",
"type": "java.lang.Boolean",
"description": "Whether to enable development property defaults.",
"defaultValue": true
},
{ {
"name": "spring.devtools.remote.debug.enabled", "name": "spring.devtools.remote.debug.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
...@@ -19,12 +25,6 @@ ...@@ -19,12 +25,6 @@
"reason": "Remote debug is no longer supported.", "reason": "Remote debug is no longer supported.",
"level": "error" "level": "error"
} }
},
{
"name": "spring.devtools.add-properties",
"type": "java.lang.Boolean",
"description": "Whether to enable development property defaults.",
"defaultValue": true
} }
] ]
} }
spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View file @ 31195273
...@@ -7,57 +7,71 @@ ...@@ -7,57 +7,71 @@
], ],
"properties": [ "properties": [
{ {
"name": "spring.banner.charset", "name": "banner.charset",
"type": "java.nio.charset.Charset", "type": "java.nio.charset.Charset",
"description": "Banner file encoding.", "description": "Banner file encoding.",
"defaultValue": "UTF-8" "defaultValue": "UTF-8",
}, "deprecation": {
{ "replacement": "spring.banner.charset",
"name": "spring.banner.location", "level": "error"
"type": "org.springframework.core.io.Resource", }
"description": "Banner text resource location.",
"defaultValue": "classpath:banner.txt"
},
{
"name": "spring.banner.image.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner image file location (jpg or png can also be used).",
"defaultValue": "classpath:banner.gif"
}, },
{ {
"name": "spring.banner.image.width", "name": "banner.image.height",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Width of the banner image in chars.", "description": "Banner image height (in chars).",
"defaultValue": 76 "deprecation": {
"replacement": "spring.banner.image.height",
"level": "error"
}
}, },
{ {
"name": "spring.banner.image.height", "name": "banner.image.invert",
"type": "java.lang.Integer", "type": "java.lang.Boolean",
"description": "Height of the banner image in chars (default based on image height)." "description": "Invert images for dark console themes.",
"defaultValue": false,
"deprecation": {
"replacement": "spring.banner.image.invert",
"level": "error"
}
}, },
{ {
"name": "spring.banner.image.margin", "name": "banner.image.location",
"type": "java.lang.Integer", "type": "org.springframework.core.io.Resource",
"description": "Left hand image margin in chars.", "description": "Banner image file location (jpg/png can also be used).",
"defaultValue": 2 "defaultValue": "banner.gif",
"deprecation": {
"replacement": "spring.banner.image.location",
"level": "error"
}
}, },
{ {
"name": "spring.banner.image.invert", "name": "banner.image.margin",
"type": "java.lang.Boolean", "type": "java.lang.Integer",
"description": "Whether images should be inverted for dark terminal themes.", "description": "Left hand image margin (in chars).",
"defaultValue": false "deprecation": {
"replacement": "spring.banner.image.margin",
"level": "error"
}
}, },
{ {
"name": "spring.banner.image.bitdepth", "name": "banner.image.width",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "The bit depth to use for ANSI colors. Supported values are 4 (16 color) or 8 (256 color).", "description": "Banner image width (in chars).",
"defaultValue": 4 "deprecation": {
"replacement": "spring.banner.image.width",
"level": "error"
}
}, },
{ {
"name": "spring.banner.image.pixelmode", "name": "banner.location",
"type": "org.springframework.boot.ImageBanner$PixelMode", "type": "org.springframework.core.io.Resource",
"description": "The pixel mode to use when rendering the image.", "description": "Banner text resource location.",
"defaultValue": "TEXT" "defaultValue": "classpath:banner.txt",
"deprecation": {
"replacement": "spring.banner.location",
"level": "error"
}
}, },
{ {
"name": "debug", "name": "debug",
...@@ -95,6 +109,20 @@ ...@@ -95,6 +109,20 @@
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": false "defaultValue": false
}, },
{
"name": "logging.file.max-history",
"type": "java.lang.Integer",
"description": "Maximum number of days archive log files are kept. Only supported with the default logback setup.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": 7
},
{
"name": "logging.file.max-size",
"type": "org.springframework.util.unit.DataSize",
"description": "Maximum log file size. Only supported with the default logback setup.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": "10MB"
},
{ {
"name": "logging.file.name", "name": "logging.file.name",
"type": "java.lang.String", "type": "java.lang.String",
...@@ -107,20 +135,6 @@ ...@@ -107,20 +135,6 @@
"description": "Location of the log file. For instance, `/var/log`.", "description": "Location of the log file. For instance, `/var/log`.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
}, },
{
"name": "logging.file.max-size",
"type": "org.springframework.util.unit.DataSize",
"description": "Maximum log file size. Only supported with the default logback setup.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": "10MB"
},
{
"name": "logging.file.max-history",
"type": "java.lang.Integer",
"description": "Maximum number of days archive log files are kept. Only supported with the default logback setup.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": 7
},
{ {
"name": "logging.file.total-size-cap", "name": "logging.file.total-size-cap",
"type": "org.springframework.util.unit.DataSize", "type": "org.springframework.util.unit.DataSize",
...@@ -191,12 +205,74 @@ ...@@ -191,12 +205,74 @@
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": false "defaultValue": false
}, },
{
"name": "spring.application.index",
"type": "java.lang.Integer",
"description": "Application index.",
"deprecation": {
"level": "error",
"reason": "Application context ids are now unique by default."
}
},
{ {
"name": "spring.application.name", "name": "spring.application.name",
"type": "java.lang.String", "type": "java.lang.String",
"sourceType": "org.springframework.boot.context.ContextIdApplicationContextInitializer", "sourceType": "org.springframework.boot.context.ContextIdApplicationContextInitializer",
"description": "Application name." "description": "Application name."
}, },
{
"name": "spring.banner.charset",
"type": "java.nio.charset.Charset",
"description": "Banner file encoding.",
"defaultValue": "UTF-8"
},
{
"name": "spring.banner.image.bitdepth",
"type": "java.lang.Integer",
"description": "The bit depth to use for ANSI colors. Supported values are 4 (16 color) or 8 (256 color).",
"defaultValue": 4
},
{
"name": "spring.banner.image.height",
"type": "java.lang.Integer",
"description": "Height of the banner image in chars (default based on image height)."
},
{
"name": "spring.banner.image.invert",
"type": "java.lang.Boolean",
"description": "Whether images should be inverted for dark terminal themes.",
"defaultValue": false
},
{
"name": "spring.banner.image.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner image file location (jpg or png can also be used).",
"defaultValue": "classpath:banner.gif"
},
{
"name": "spring.banner.image.margin",
"type": "java.lang.Integer",
"description": "Left hand image margin in chars.",
"defaultValue": 2
},
{
"name": "spring.banner.image.pixelmode",
"type": "org.springframework.boot.ImageBanner$PixelMode",
"description": "The pixel mode to use when rendering the image.",
"defaultValue": "TEXT"
},
{
"name": "spring.banner.image.width",
"type": "java.lang.Integer",
"description": "Width of the banner image in chars.",
"defaultValue": 76
},
{
"name": "spring.banner.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner text resource location.",
"defaultValue": "classpath:banner.txt"
},
{ {
"name": "spring.beaninfo.ignore", "name": "spring.beaninfo.ignore",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
...@@ -211,17 +287,17 @@ ...@@ -211,17 +287,17 @@
"description": "Config file locations used in addition to the defaults." "description": "Config file locations used in addition to the defaults."
}, },
{ {
"name": "spring.config.name", "name": "spring.config.location",
"type": "java.lang.String", "type": "java.lang.String",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener", "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"description": "Config file name.", "description": "Config file locations that replace the defaults."
"defaultValue": "application"
}, },
{ {
"name": "spring.config.location", "name": "spring.config.name",
"type": "java.lang.String", "type": "java.lang.String",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener", "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"description": "Config file locations that replace the defaults." "description": "Config file name.",
"defaultValue": "application"
}, },
{ {
"name": "spring.jta.atomikos.connectionfactory.borrow-connection-timeout", "name": "spring.jta.atomikos.connectionfactory.borrow-connection-timeout",
...@@ -722,18 +798,18 @@ ...@@ -722,18 +798,18 @@
"description": "Configures the ANSI output.", "description": "Configures the ANSI output.",
"defaultValue": "detect" "defaultValue": "detect"
}, },
{
"name": "spring.pid.file",
"type": "java.lang.String",
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
"sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
},
{ {
"name": "spring.pid.fail-on-write-error", "name": "spring.pid.fail-on-write-error",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
"description": "Fails if ApplicationPidFileWriter is used but it cannot write the PID file.", "description": "Fails if ApplicationPidFileWriter is used but it cannot write the PID file.",
"sourceType": "org.springframework.boot.context.ApplicationPidFileWriter" "sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
}, },
{
"name": "spring.pid.file",
"type": "java.lang.String",
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
"sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
},
{ {
"name": "spring.profiles", "name": "spring.profiles",
"type": "java.util.List<java.lang.String>", "type": "java.util.List<java.lang.String>",
...@@ -765,82 +841,6 @@ ...@@ -765,82 +841,6 @@
"description": "Enable trace logs.", "description": "Enable trace logs.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": false "defaultValue": false
},
{
"name": "banner.charset",
"type": "java.nio.charset.Charset",
"description": "Banner file encoding.",
"defaultValue": "UTF-8",
"deprecation": {
"replacement": "spring.banner.charset",
"level": "error"
}
},
{
"name": "banner.image.height",
"type": "java.lang.Integer",
"description": "Banner image height (in chars).",
"deprecation": {
"replacement": "spring.banner.image.height",
"level": "error"
}
},
{
"name": "banner.image.invert",
"type": "java.lang.Boolean",
"description": "Invert images for dark console themes.",
"defaultValue": false,
"deprecation": {
"replacement": "spring.banner.image.invert",
"level": "error"
}
},
{
"name": "banner.image.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner image file location (jpg/png can also be used).",
"defaultValue": "banner.gif",
"deprecation": {
"replacement": "spring.banner.image.location",
"level": "error"
}
},
{
"name": "banner.image.margin",
"type": "java.lang.Integer",
"description": "Left hand image margin (in chars).",
"deprecation": {
"replacement": "spring.banner.image.margin",
"level": "error"
}
},
{
"name": "banner.image.width",
"type": "java.lang.Integer",
"description": "Banner image width (in chars).",
"deprecation": {
"replacement": "spring.banner.image.width",
"level": "error"
}
},
{
"name": "banner.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner text resource location.",
"defaultValue": "classpath:banner.txt",
"deprecation": {
"replacement": "spring.banner.location",
"level": "error"
}
},
{
"name": "spring.application.index",
"type": "java.lang.Integer",
"description": "Application index.",
"deprecation": {
"level": "error",
"reason": "Application context ids are now unique by default."
}
} }
], ],
"hints": [ "hints": [
...@@ -852,7 +852,6 @@ ...@@ -852,7 +852,6 @@
"parameters": { "parameters": {
"group": false "group": false
} }
} }
] ]
}, },
...@@ -927,4 +926,3 @@ ...@@ -927,4 +926,3 @@
} }
] ]
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment