diff --git a/docs/configuration/arguments.md b/docs/configuration/arguments.md index a99fe4dace..757e649be6 100644 --- a/docs/configuration/arguments.md +++ b/docs/configuration/arguments.md @@ -318,11 +318,9 @@ overrides: tenant1: ingestion_rate: 10000 max_series_per_metric: 100000 - max_series_per_query: 100000 + max_fetched_series_per_query: 10000 tenant2: - max_samples_per_query: 1000000 max_series_per_metric: 100000 - max_series_per_query: 100000 multi_kv_config: mirror_enabled: false @@ -348,11 +346,8 @@ overrides: tenant1: ingestion_rate: 10000 max_series_per_metric: 100000 - max_series_per_query: 100000 tenant2: - max_samples_per_query: 1000000 max_series_per_metric: 100000 - max_series_per_query: 100000 ``` Valid per-tenant limits are (with their corresponding flags for default values): diff --git a/docs/guides/overrides-exporter-runtime.yaml b/docs/guides/overrides-exporter-runtime.yaml index ed4f46b7b3..f1b08f970a 100644 --- a/docs/guides/overrides-exporter-runtime.yaml +++ b/docs/guides/overrides-exporter-runtime.yaml @@ -8,5 +8,3 @@ overrides: max_global_series_per_user: 300000 max_series_per_metric: 0 max_series_per_user: 0 - max_samples_per_query: 100000 - max_series_per_query: 100000 diff --git a/docs/guides/overrides-exporter.md b/docs/guides/overrides-exporter.md index 9cfa7e00f0..bd239d9477 100644 --- a/docs/guides/overrides-exporter.md +++ b/docs/guides/overrides-exporter.md @@ -36,8 +36,6 @@ overrides: max_global_series_per_user: 300000 max_series_per_metric: 0 max_series_per_user: 0 - max_samples_per_query: 100000 - max_series_per_query: 100000 ``` The `overrides-exporter` is configured to run as follows: @@ -59,7 +57,6 @@ cortex_overrides{limit_name="max_global_series_per_user",user="user1"} 300000 cortex_overrides{limit_name="max_local_series_per_metric",user="user1"} 0 cortex_overrides{limit_name="max_local_series_per_user",user="user1"} 0 cortex_overrides{limit_name="max_samples_per_query",user="user1"} 100000 -cortex_overrides{limit_name="max_series_per_query",user="user1"} 100000 ``` With these metrics, you can set up alerts to know when tenants are close to hitting their limits