diff --git a/CHANGELOG.md b/CHANGELOG.md index c3ebfd3a53e..b6cadc10531 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ * [CHANGE] General: remove `-log.buffered`. The configuration option has been enabled by default and deprecated since Mimir 2.11. #8395 * [CHANGE] Ruler: promote tenant federation from experimental to stable. #8400 * [CHANGE] Ruler: promote `-ruler.recording-rules-evaluation-enabled` and `-ruler.alerting-rules-evaluation-enabled` from experimental to stable. #8400 +* [CHANGE] General: promote `-tenant-federation.max-tenants` from experimental to stable. #8400 * [FEATURE] Continuous-test: now runable as a module with `mimir -target=continuous-test`. #7747 * [FEATURE] Store-gateway: Allow specific tenants to be enabled or disabled via `-store-gateway.enabled-tenants` or `-store-gateway.disabled-tenants` CLI flags or their corresponding YAML settings. #7653 * [FEATURE] New `-.s3.bucket-lookup-type` flag configures lookup style type, used to access bucket in s3 compatible providers. #7684 diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index 06d1e21d239..230e0375adc 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -10416,8 +10416,7 @@ "fieldValue": null, "fieldDefaultValue": 0, "fieldFlag": "tenant-federation.max-tenants", - "fieldType": "int", - "fieldCategory": "experimental" + "fieldType": "int" } ], "fieldValue": null, diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl index 0a0a10b4909..d4cbc603a3d 100644 --- a/cmd/mimir/help-all.txt.tmpl +++ b/cmd/mimir/help-all.txt.tmpl @@ -2850,7 +2850,7 @@ Usage of ./cmd/mimir/mimir: -tenant-federation.max-concurrent int [experimental] The number of workers used for each tenant federated query. This setting limits the maximum number of per-tenant queries executed at a time for a tenant federated query. (default 16) -tenant-federation.max-tenants int - [experimental] The max number of tenant IDs that may be supplied for a federated query if enabled. 0 to disable the limit. + The max number of tenant IDs that may be supplied for a federated query if enabled. 0 to disable the limit. -tests.basic-auth-password string The password to use for HTTP bearer authentication. (mutually exclusive with tenant-id or bearer-token flags) -tests.basic-auth-user string diff --git a/cmd/mimir/help.txt.tmpl b/cmd/mimir/help.txt.tmpl index 9f42899a6cf..1107b2ce5f3 100644 --- a/cmd/mimir/help.txt.tmpl +++ b/cmd/mimir/help.txt.tmpl @@ -727,6 +727,8 @@ Usage of ./cmd/mimir/mimir: Comma-separated list of components to include in the instantiated process. The default value 'all' includes all components that are required to form a functional Grafana Mimir instance in single-binary mode. Use the '-modules' command line flag to get a list of available components, and to see which components are included with 'all'. (default all) -tenant-federation.enabled If enabled on all services, queries can be federated across multiple tenants. The tenant IDs involved need to be specified separated by a '|' character in the 'X-Scope-OrgID' header. + -tenant-federation.max-tenants int + The max number of tenant IDs that may be supplied for a federated query if enabled. 0 to disable the limit. -tests.basic-auth-password string The password to use for HTTP bearer authentication. (mutually exclusive with tenant-id or bearer-token flags) -tests.basic-auth-user string diff --git a/docs/sources/mimir/configure/about-versioning.md b/docs/sources/mimir/configure/about-versioning.md index e8bf48d4850..030ec40d344 100644 --- a/docs/sources/mimir/configure/about-versioning.md +++ b/docs/sources/mimir/configure/about-versioning.md @@ -151,7 +151,6 @@ The following features are currently experimental: - Lower TTL for cache entries overlapping the out-of-order samples ingestion window (re-using `-ingester.out-of-order-window` from ingesters) - Use of Redis cache backend (`-query-frontend.results-cache.backend=redis`) - Query blocking on a per-tenant basis (configured with the limit `blocked_queries`) - - Max number of tenants that may be queried at once (`-tenant-federation.max-tenants`) - Sharding of active series queries (`-query-frontend.shard-active-series-queries`) - Server-side write timeout for responses to active series requests (`-query-frontend.active-series-write-timeout`) - Remote read request limits (`-query-frontend.remote-read-limits-enabled`) diff --git a/docs/sources/mimir/configure/configuration-parameters/index.md b/docs/sources/mimir/configure/configuration-parameters/index.md index 75191e23a9a..105da2d0207 100644 --- a/docs/sources/mimir/configure/configuration-parameters/index.md +++ b/docs/sources/mimir/configure/configuration-parameters/index.md @@ -216,8 +216,8 @@ tenant_federation: # CLI flag: -tenant-federation.max-concurrent [max_concurrent: | default = 16] - # (experimental) The max number of tenant IDs that may be supplied for a - # federated query if enabled. 0 to disable the limit. + # The max number of tenant IDs that may be supplied for a federated query if + # enabled. 0 to disable the limit. # CLI flag: -tenant-federation.max-tenants [max_tenants: | default = 0] diff --git a/pkg/querier/tenantfederation/tenant_federation.go b/pkg/querier/tenantfederation/tenant_federation.go index cfb148c7171..85abdc7b85b 100644 --- a/pkg/querier/tenantfederation/tenant_federation.go +++ b/pkg/querier/tenantfederation/tenant_federation.go @@ -22,7 +22,7 @@ type Config struct { // Enabled switches on support for multi tenant query federation Enabled bool `yaml:"enabled"` MaxConcurrent int `yaml:"max_concurrent" category:"experimental"` - MaxTenants int `yaml:"max_tenants" category:"experimental"` + MaxTenants int `yaml:"max_tenants"` } func (cfg *Config) RegisterFlags(f *flag.FlagSet) {