From 37901b795add7d61ace140cdeec434e42080617f Mon Sep 17 00:00:00 2001 From: Ying WANG Date: Fri, 27 Dec 2024 16:05:00 +0100 Subject: [PATCH] update config file --- cmd/mimir/config-descriptor.json | 2 +- cmd/mimir/help-all.txt.tmpl | 4 ++-- docs/sources/mimir/configure/about-versioning.md | 2 ++ .../sources/mimir/configure/configuration-parameters/index.md | 2 +- pkg/mimir/mimir.go | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index f2fc6ad3f2..199aaecdf4 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -19713,7 +19713,7 @@ "desc": "Time interval at which the cost attribution cleanup process runs, ensuring inactive cost attribution entries are purged.", "fieldValue": null, "fieldDefaultValue": 180000000000, - "fieldFlag": "cleanup-interval", + "fieldFlag": "cost-attribution.cleanup-interval", "fieldType": "duration", "fieldCategory": "experimental" } diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl index 3ab952fbd7..7fdd772c44 100644 --- a/cmd/mimir/help-all.txt.tmpl +++ b/cmd/mimir/help-all.txt.tmpl @@ -971,8 +971,6 @@ Usage of ./cmd/mimir/mimir: Maximum number of CPUs that can simultaneously processes WAL replay. If it is set to 0, then each TSDB is replayed with a concurrency equal to the number of CPU cores available on the machine. -blocks-storage.tsdb.wal-segment-size-bytes int TSDB WAL segments files max size (bytes). (default 134217728) - -cleanup-interval duration - [experimental] Time interval at which the cost attribution cleanup process runs, ensuring inactive cost attribution entries are purged. (default 3m0s) -common.storage.azure.account-key string Azure storage account key. If unset, Azure managed identities will be used for authentication instead. -common.storage.azure.account-name string @@ -1285,6 +1283,8 @@ Usage of ./cmd/mimir/mimir: Expands ${var} or $var in config according to the values of the environment variables. -config.file value Configuration file to load. + -cost-attribution.cleanup-interval duration + [experimental] Time interval at which the cost attribution cleanup process runs, ensuring inactive cost attribution entries are purged. (default 3m0s) -cost-attribution.eviction-interval duration [experimental] Time interval at which inactive cost attributions are evicted from the counter, ensuring they are not included in the cost attribution cardinality per user limit. (default 20m0s) -cost-attribution.registry-path string diff --git a/docs/sources/mimir/configure/about-versioning.md b/docs/sources/mimir/configure/about-versioning.md index 05751699ea..5219b71118 100644 --- a/docs/sources/mimir/configure/about-versioning.md +++ b/docs/sources/mimir/configure/about-versioning.md @@ -57,6 +57,8 @@ The following features are currently experimental: - `-cost-attribution.eviction-interval` - Configure the metrics endpoint dedicated to cost attribution - `-cost-attribution.registry-path` + - Configure the cost attribution cleanup process run interval + - `-cost-attribution.cleanup-interval` - Alertmanager - Enable a set of experimental API endpoints to help support the migration of the Grafana Alertmanager to the Mimir Alertmanager. - `-alertmanager.grafana-alertmanager-compatibility-enabled` diff --git a/docs/sources/mimir/configure/configuration-parameters/index.md b/docs/sources/mimir/configure/configuration-parameters/index.md index ac4c01aafe..2a982ccd36 100644 --- a/docs/sources/mimir/configure/configuration-parameters/index.md +++ b/docs/sources/mimir/configure/configuration-parameters/index.md @@ -470,7 +470,7 @@ overrides_exporter: # (experimental) Time interval at which the cost attribution cleanup process # runs, ensuring inactive cost attribution entries are purged. -# CLI flag: -cleanup-interval +# CLI flag: -cost-attribution.cleanup-interval [cost_attribution_cleanup_interval: | default = 3m] ``` diff --git a/pkg/mimir/mimir.go b/pkg/mimir/mimir.go index 9558069af5..540d0f7bbd 100644 --- a/pkg/mimir/mimir.go +++ b/pkg/mimir/mimir.go @@ -180,7 +180,7 @@ func (c *Config) RegisterFlags(f *flag.FlagSet, logger log.Logger) { f.BoolVar(&c.TimeseriesUnmarshalCachingOptimizationEnabled, "timeseries-unmarshal-caching-optimization-enabled", true, "Enables optimized marshaling of timeseries.") f.StringVar(&c.CostAttributionRegistryPath, "cost-attribution.registry-path", "", "Defines a custom path for the registry. When specified, Mimir exposes cost attribution metrics through this custom path. If not specified, cost attribution metrics aren't exposed.") f.DurationVar(&c.CostAttributionEvictionInterval, "cost-attribution.eviction-interval", 20*time.Minute, "Time interval at which inactive cost attributions are evicted from the counter, ensuring they are not included in the cost attribution cardinality per user limit.") - f.DurationVar(&c.CostAttributionCleanupInterval, "cleanup-interval", 3*time.Minute, "Time interval at which the cost attribution cleanup process runs, ensuring inactive cost attribution entries are purged.") + f.DurationVar(&c.CostAttributionCleanupInterval, "cost-attribution.cleanup-interval", 3*time.Minute, "Time interval at which the cost attribution cleanup process runs, ensuring inactive cost attribution entries are purged.") c.API.RegisterFlags(f) c.registerServerFlagsWithChangedDefaultValues(f)