Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

[fixup] ruler limits config key name #222

Merged
Parent: Fix DNS based service discovery for memcached endpoints
merged 1 commit into from
Nov 20, 2020
Merged

[fixup] ruler limits config key name #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## master / unreleased

* [CHANGE] Add default present for ruler limits on all 'user' types. #221
* [CHANGE] Add default present for ruler limits on all 'user' types. #221, #222
* [CHANGE] Enabled sharding for the blocks storage compactor. #218
* [ENHANCEMENT] Introduce a resources dashboard for the Alertmanager. #219

Expand Down
24 changes: 12 additions & 12 deletions cortex/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@
ingestion_burst_size: 200000,

// 300 rules
max_rules_per_rule_group: 15,
max_rule_groups_per_tenant: 20,
ruler_max_rules_per_rule_group: 15,
ruler_max_rule_groups_per_tenant: 20,
},

small_user:: {
Expand All @@ -313,8 +313,8 @@
ingestion_burst_size: 1000000,

// 450 rules
max_rules_per_rule_group: 15,
max_rule_groups_per_tenant: 30,
ruler_max_rules_per_rule_group: 15,
ruler_max_rule_groups_per_tenant: 30,
},

medium_user:: {
Expand All @@ -331,8 +331,8 @@
ingestion_burst_size: 3500000, // 3.5M

// 600 rules
max_rules_per_rule_group: 15,
max_rule_groups_per_tenant: 40,
ruler_max_rules_per_rule_group: 15,
ruler_max_rule_groups_per_tenant: 40,
},

big_user:: {
Expand All @@ -349,8 +349,8 @@
ingestion_burst_size: 7000000, // 7M

// 750 rules
max_rules_per_rule_group: 15,
max_rule_groups_per_tenant: 50,
ruler_max_rules_per_rule_group: 15,
ruler_max_rule_groups_per_tenant: 50,
},

super_user:: {
Expand All @@ -367,8 +367,8 @@
ingestion_burst_size: 15000000, // 15M

// 900 rules
max_rules_per_rule_group: 15,
max_rule_groups_per_tenant: 60,
ruler_max_rules_per_rule_group: 15,
ruler_max_rule_groups_per_tenant: 60,
},

// This user class has limits increased by +50% compared to the previous one.
Expand All @@ -386,8 +386,8 @@
ingestion_burst_size: 22500000, // 22.5M

// 1050 rules
max_rules_per_rule_group: 15,
max_rule_groups_per_tenant: 70,
ruler_max_rules_per_rule_group: 15,
ruler_max_rule_groups_per_tenant: 70,
},
},

Expand Down
4 changes: 2 additions & 2 deletions cortex/ruler.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
'ruler.ring.consul.hostname': 'consul.%s.svc.cluster.local:8500' % $._config.namespace,

// Limits
'ruler.max-rules-per-rule-group': $._config.limits.max_rules_per_rule_group,
'ruler.max-rule-groups-per-tenant': $._config.limits.max_rule_groups_per_tenant,
'ruler.max-rules-per-rule-group': $._config.limits.ruler_max_rules_per_rule_group,
'ruler.max-rule-groups-per-tenant': $._config.limits.ruler_max_rule_groups_per_tenant,
},

ruler_container::
Expand Down