From d4f8da6ba82838ad8956c49a64ae127b6afa54d0 Mon Sep 17 00:00:00 2001 From: Goutham Veeramachaneni Date: Wed, 15 Sep 2021 15:43:18 +0200 Subject: [PATCH] Update rule limits to be inline with customer expectations We built the initial rules on guesswork and now we're updating them based on what the customers are asking for. Further, the ruler can be horizontally scaled and we're happy letting our users have more rules! Signed-off-by: Goutham Veeramachaneni --- CHANGELOG.md | 1 + cortex/config.libsonnet | 42 ++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e728aa..3d9e947 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ * [CHANGE] Decreased `-server.grpc-max-concurrent-streams` from 100k to 10k. #369 * [CHANGE] Decreased blocks storage ingesters graceful termination period from 80m to 20m. #369 * [CHANGE] Changed default `job_names` for query-frontend, query-scheduler and querier to match custom deployments too. #376 +* [CHANGE] Increase the rules per group and rule groups limits on different tiers. #396 * [ENHANCEMENT] Add overrides config to compactor. This allows setting retention configs per user. #386 * [ENHANCEMENT] cortex-mixin: Make `cluster_namespace_deployment:kube_pod_container_resource_requests_{cpu_cores,memory_bytes}:sum` backwards compatible with `kube-state-metrics` v2.0.0. #317 * [ENHANCEMENT] Cortex-mixin: Include `cortex-gw-internal` naming variation in default `gateway` job names. #328 diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet index f52b38d..4746b30 100644 --- a/cortex/config.libsonnet +++ b/cortex/config.libsonnet @@ -353,9 +353,9 @@ ingestion_rate: 10000, ingestion_burst_size: 200000, - // 300 rules - ruler_max_rules_per_rule_group: 15, - ruler_max_rule_groups_per_tenant: 20, + // 700 rules + ruler_max_rules_per_rule_group: 20, + ruler_max_rule_groups_per_tenant: 35, // No retention for now. compactor_blocks_retention_period: '0', @@ -374,9 +374,9 @@ ingestion_rate: 30000, ingestion_burst_size: 300000, - // 375 rules - ruler_max_rules_per_rule_group: 15, - ruler_max_rule_groups_per_tenant: 25, + // 1000 rules + ruler_max_rules_per_rule_group: 20, + ruler_max_rule_groups_per_tenant: 50, }, small_user:: { @@ -392,9 +392,9 @@ ingestion_rate: 100000, ingestion_burst_size: 1000000, - // 450 rules - ruler_max_rules_per_rule_group: 15, - ruler_max_rule_groups_per_tenant: 30, + // 1400 rules + ruler_max_rules_per_rule_group: 20, + ruler_max_rule_groups_per_tenant: 70, }, medium_user:: { @@ -410,9 +410,9 @@ ingestion_rate: 350000, // 350K ingestion_burst_size: 3500000, // 3.5M - // 600 rules - ruler_max_rules_per_rule_group: 15, - ruler_max_rule_groups_per_tenant: 40, + // 1800 rules + ruler_max_rules_per_rule_group: 20, + ruler_max_rule_groups_per_tenant: 90, }, big_user:: { @@ -428,9 +428,9 @@ ingestion_rate: 700000, // 700K ingestion_burst_size: 7000000, // 7M - // 750 rules - ruler_max_rules_per_rule_group: 15, - ruler_max_rule_groups_per_tenant: 50, + // 2200 rules + ruler_max_rules_per_rule_group: 20, + ruler_max_rule_groups_per_tenant: 110, }, super_user:: { @@ -446,9 +446,9 @@ ingestion_rate: 1500000, // 1.5M ingestion_burst_size: 15000000, // 15M - // 900 rules - ruler_max_rules_per_rule_group: 15, - ruler_max_rule_groups_per_tenant: 60, + // 2600 rules + ruler_max_rules_per_rule_group: 20, + ruler_max_rule_groups_per_tenant: 130, }, // This user class has limits increased by +50% compared to the previous one. @@ -465,9 +465,9 @@ ingestion_rate: 2250000, // 2.25M ingestion_burst_size: 22500000, // 22.5M - // 1050 rules - ruler_max_rules_per_rule_group: 15, - ruler_max_rule_groups_per_tenant: 70, + // 3000 rules + ruler_max_rules_per_rule_group: 20, + ruler_max_rule_groups_per_tenant: 150, }, },