diff --git a/CHANGELOG.md b/CHANGELOG.md index 71ab199ca66..e401f2f6971 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ * [CHANGE] Tracing: Move query information to span attributes instead of span logs. #7046 * [CHANGE] Distributor: the default value of circuit breaker's CLI flag `-ingester.client.circuit-breaker.cooldown-period` has been changed from `1m` to `10s`. #7310 * [CHANGE] Store-gateway: remove `cortex_bucket_store_blocks_loaded_by_duration`. `cortex_bucket_store_series_blocks_queried` is better suited for detecting when compactors are not able to keep up with the number of blocks to compact. #7309 +* [CHANGE] Distributor: Change`-distributor.enable-otlp-metadata-storage` flag's default to true, and deprecate it. The flag will be removed in Mimir 2.14. #7366 * [FEATURE] Introduce `-server.log-source-ips-full` option to log all IPs from `Forwarded`, `X-Real-IP`, `X-Forwarded-For` headers. #7250 * [FEATURE] Introduce `-tenant-federation.max-tenants` option to limit the max number of tenants allowed for requests when federation is enabled. #6959 * [FEATURE] Cardinality API: added a new `count_method` parameter which enables counting active label values. #7085 diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index 0c01a057eef..744fa83c750 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -91,10 +91,10 @@ "required": false, "desc": "If true, store metadata when ingesting metrics via OTLP. This makes metric descriptions and types available for metrics ingested via OTLP.", "fieldValue": null, - "fieldDefaultValue": false, + "fieldDefaultValue": true, "fieldFlag": "distributor.enable-otlp-metadata-storage", "fieldType": "boolean", - "fieldCategory": "experimental" + "fieldCategory": "deprecated" }, { "kind": "field", diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl index f3bd95827a5..a5f70963da6 100644 --- a/cmd/mimir/help-all.txt.tmpl +++ b/cmd/mimir/help-all.txt.tmpl @@ -1066,7 +1066,7 @@ Usage of ./cmd/mimir/mimir: -distributor.drop-label string This flag can be used to specify label names that to drop during sample ingestion within the distributor and can be repeated in order to drop multiple labels. -distributor.enable-otlp-metadata-storage - [experimental] If true, store metadata when ingesting metrics via OTLP. This makes metric descriptions and types available for metrics ingested via OTLP. + [deprecated] If true, store metadata when ingesting metrics via OTLP. This makes metric descriptions and types available for metrics ingested via OTLP. (default true) -distributor.ha-tracker.cluster string Prometheus label to look for in samples to identify a Prometheus HA cluster. (default "cluster") -distributor.ha-tracker.consul.acl-token string diff --git a/docs/sources/mimir/configure/about-versioning.md b/docs/sources/mimir/configure/about-versioning.md index 8f3609ae26b..35fc21ed187 100644 --- a/docs/sources/mimir/configure/about-versioning.md +++ b/docs/sources/mimir/configure/about-versioning.md @@ -63,9 +63,6 @@ The following features are currently experimental: - Distributor - Metrics relabeling - `-distributor.metric-relabeling-enabled` - - OTLP ingestion path - - OTLP metadata storage - - `-distributor.enable-otlp-metadata-storage` - Using status code 529 instead of 429 upon rate limit exhaustion. - `distributor.service-overload-status-code-on-rate-limit-enabled` - Set Retry-After header in recoverable error responses diff --git a/docs/sources/mimir/configure/configuration-parameters/index.md b/docs/sources/mimir/configure/configuration-parameters/index.md index e2538acbbd9..589da5457e3 100644 --- a/docs/sources/mimir/configure/configuration-parameters/index.md +++ b/docs/sources/mimir/configure/configuration-parameters/index.md @@ -141,10 +141,10 @@ api: # CLI flag: -api.skip-label-name-validation-header-enabled [skip_label_name_validation_header_enabled: | default = false] - # (experimental) If true, store metadata when ingesting metrics via OTLP. This + # (deprecated) If true, store metadata when ingesting metrics via OTLP. This # makes metric descriptions and types available for metrics ingested via OTLP. # CLI flag: -distributor.enable-otlp-metadata-storage - [enable_otel_metadata_translation: | default = false] + [enable_otel_metadata_translation: | default = true] # (advanced) HTTP URL path under which the Alertmanager ui and api will be # served. diff --git a/pkg/api/api.go b/pkg/api/api.go index b33cb70ebfb..399d9a635c4 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -52,7 +52,8 @@ type ConfigHandler func(actualCfg interface{}, defaultCfg interface{}) http.Hand type Config struct { SkipLabelNameValidationHeader bool `yaml:"skip_label_name_validation_header_enabled" category:"advanced"` - EnableOtelMetadataStorage bool `yaml:"enable_otel_metadata_translation" category:"experimental"` + // TODO: Remove option in Mimir 2.14. + EnableOtelMetadataStorage bool `yaml:"enable_otel_metadata_translation" category:"deprecated"` AlertmanagerHTTPPrefix string `yaml:"alertmanager_http_prefix" category:"advanced"` PrometheusHTTPPrefix string `yaml:"prometheus_http_prefix" category:"advanced"` @@ -71,7 +72,7 @@ type Config struct { // RegisterFlags adds the flags required to config this to the given FlagSet. func (cfg *Config) RegisterFlags(f *flag.FlagSet) { f.BoolVar(&cfg.SkipLabelNameValidationHeader, "api.skip-label-name-validation-header-enabled", false, "Allows to skip label name validation via X-Mimir-SkipLabelNameValidation header on the http write path. Use with caution as it breaks PromQL. Allowing this for external clients allows any client to send invalid label names. After enabling it, requests with a specific HTTP header set to true will not have label names validated.") - f.BoolVar(&cfg.EnableOtelMetadataStorage, "distributor.enable-otlp-metadata-storage", false, "If true, store metadata when ingesting metrics via OTLP. This makes metric descriptions and types available for metrics ingested via OTLP.") + f.BoolVar(&cfg.EnableOtelMetadataStorage, "distributor.enable-otlp-metadata-storage", true, "If true, store metadata when ingesting metrics via OTLP. This makes metric descriptions and types available for metrics ingested via OTLP.") cfg.RegisterFlagsWithPrefix("", f) }