Merge pull request #220 from grafana/rollback-pr-213

Rollback PR 213

Author: pracucci

CHANGELOG.md

@@ -2,7 +2,6 @@
 
 ## master / unreleased
 
-* [CHANGE] Add default present for ruler limits on all 'user' types. #213
 * [CHANGE] Enabled sharding for the blocks storage compactor. #218
 * [ENHANCEMENT] Introduce a resources dashboard for the Alertmanager. #219
 

cortex/config.libsonnet

@@ -293,10 +293,6 @@
 
         ingestion_rate: 10000,
         ingestion_burst_size: 200000,
-
-        // 300 rules
-        max_rules_per_rule_group: 15,
-        max_rule_groups_per_tenant: 20,
       },
 
       small_user:: {
@@ -311,10 +307,6 @@
 
         ingestion_rate: 100000,
         ingestion_burst_size: 1000000,
-
-        // 450 rules
-        max_rules_per_rule_group: 15,
-        max_rule_groups_per_tenant: 30,
       },
 
       medium_user:: {
@@ -329,10 +321,6 @@
 
         ingestion_rate: 350000,  // 350K
         ingestion_burst_size: 3500000,  // 3.5M
-
-        // 600 rules
-        max_rules_per_rule_group: 15,
-        max_rule_groups_per_tenant: 40,
       },
 
       big_user:: {
@@ -347,10 +335,6 @@
 
         ingestion_rate: 700000,  // 700K
         ingestion_burst_size: 7000000,  // 7M
-
-        // 750 rules
-        max_rules_per_rule_group: 15,
-        max_rule_groups_per_tenant: 50,
       },
 
       super_user:: {
@@ -365,10 +349,6 @@
 
         ingestion_rate: 1500000,  // 1.5M
         ingestion_burst_size: 15000000,  // 15M
-
-        // 900 rules
-        max_rules_per_rule_group: 15,
-        max_rule_groups_per_tenant: 60,
       },
 
       // This user class has limits increased by +50% compared to the previous one.
@@ -384,10 +364,6 @@
 
         ingestion_rate: 2250000,  // 2.25M
         ingestion_burst_size: 22500000,  // 22.5M
-
-        // 1050 rules
-        max_rules_per_rule_group: 15,
-        max_rule_groups_per_tenant: 70,
       },
     },
 

cortex/ruler.libsonnet

@@ -18,10 +18,6 @@
       // Ring Configs
       'ruler.enable-sharding': true,
       '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_container::