Merge branch '3.0.x' into 3.1.x

Closes gh-37253
This commit is contained in:
Moritz Halbritter
2023-09-08 11:17:40 +02:00

View File

@@ -1605,6 +1605,13 @@
"level": "error"
}
},
{
"name": "management.metrics.export.signalfx.published-histogram-type",
"deprecation": {
"level": "error",
"replacement": "management.signalfx.metrics.export.published-histogram-type"
}
},
{
"name": "management.metrics.export.signalfx.read-timeout",
"type": "java.time.Duration",
@@ -2146,6 +2153,10 @@
"name": "management.server.ssl.trust-store-type",
"description": "Type of the trust store."
},
{
"name": "management.signalfx.metrics.export.published-histogram-type",
"defaultValue": "default"
},
{
"name": "management.simple.metrics.export.mode",
"defaultValue": "cumulative"