From ad9d14f89cf9018cf2d7a83498d1b587abc01def Mon Sep 17 00:00:00 2001 From: Andrew Gray Date: Thu, 17 Jul 2025 13:25:59 -0500 Subject: [PATCH 1/3] Remove references to max_series_per_query from docs Remove references to max_samples_per_query from docs Signed-off-by: Andrew Gray --- docs/configuration/arguments.md | 7 +------ docs/guides/overrides-exporter-runtime.yaml | 2 -- docs/guides/overrides-exporter.md | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/docs/configuration/arguments.md b/docs/configuration/arguments.md index a99fe4daced..757e649be63 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 ed4f46b7b3e..f1b08f970ad 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 9cfa7e00f00..bd239d9477d 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 From 83ee5395456f0f8fae5a7e22ebbf930df8f9f42a Mon Sep 17 00:00:00 2001 From: Andrew Gray Date: Thu, 7 Aug 2025 09:06:14 -0500 Subject: [PATCH 2/3] PR feedback: Add max_fetched_series_per_query properly to examples Signed-off-by: Andrew Gray --- docs/configuration/arguments.md | 3 +++ docs/guides/overrides-exporter-runtime.yaml | 1 + docs/guides/overrides-exporter.md | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/configuration/arguments.md b/docs/configuration/arguments.md index 757e649be63..fae26ab34be 100644 --- a/docs/configuration/arguments.md +++ b/docs/configuration/arguments.md @@ -321,6 +321,7 @@ overrides: max_fetched_series_per_query: 10000 tenant2: max_series_per_metric: 100000 + max_fetched_series_per_query: 100000 multi_kv_config: mirror_enabled: false @@ -346,8 +347,10 @@ overrides: tenant1: ingestion_rate: 10000 max_series_per_metric: 100000 + max_fetched_series_per_query: 100000 tenant2: max_series_per_metric: 100000 + max_fetched_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 f1b08f970ad..4b8b4599307 100644 --- a/docs/guides/overrides-exporter-runtime.yaml +++ b/docs/guides/overrides-exporter-runtime.yaml @@ -8,3 +8,4 @@ overrides: max_global_series_per_user: 300000 max_series_per_metric: 0 max_series_per_user: 0 + max_fetched_series_per_query: 100000 \ No newline at end of file diff --git a/docs/guides/overrides-exporter.md b/docs/guides/overrides-exporter.md index bd239d9477d..f089ac21397 100644 --- a/docs/guides/overrides-exporter.md +++ b/docs/guides/overrides-exporter.md @@ -35,7 +35,8 @@ overrides: max_global_series_per_metric: 300000 max_global_series_per_user: 300000 max_series_per_metric: 0 - max_series_per_user: 0 + max_series_per_user: + exitmax_fetched_series_per_query: 100000 ``` The `overrides-exporter` is configured to run as follows: From a34e5e00a09ed4c29ef836acbd16a9a9c5d1e10a Mon Sep 17 00:00:00 2001 From: Andrew Gray Date: Mon, 18 Aug 2025 11:32:50 -0500 Subject: [PATCH 3/3] PR feedback Signed-off-by: Andrew Gray --- docs/guides/overrides-exporter.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/overrides-exporter.md b/docs/guides/overrides-exporter.md index f089ac21397..5e8b7f9af6b 100644 --- a/docs/guides/overrides-exporter.md +++ b/docs/guides/overrides-exporter.md @@ -35,8 +35,8 @@ overrides: max_global_series_per_metric: 300000 max_global_series_per_user: 300000 max_series_per_metric: 0 - max_series_per_user: - exitmax_fetched_series_per_query: 100000 + max_series_per_user: 0 + max_fetched_series_per_query: 100000 ``` The `overrides-exporter` is configured to run as follows: