Merge pull request #185 from grafana/reduce-default-series-limit

Lower default ingestion limits and create a new overrides user

Author: gotjosh

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## master / unreleased
 
+* [CHANGE] Lower the default overrides configs for ingestion and create a new overrides user out of the previous config #183
 * [CHANGE] The project is now licensed with Apache-2.0 license. #169
 * [CHANGE] Add overrides config to tsdb store-gateway. #167
 * [CHANGE] Ingesters now default to running as `StatefulSet` with WAL enabled. It is controlled by the config `$._config.ingester_deployment_without_wal` which is `false` by default. Setting the config to `true` will yield the old behaviour (stateless `Deployment` without WAL enabled). #72

cortex/config.libsonnet

@@ -280,20 +280,34 @@
       // These are the defaults. Distributor limits will be 5x (#replicas) higher,
       // ingester limits are 6s (#replicas) / 3x (#replication factor) higher.
       //
-      // small_user: {
-      //   ingestion_rate: 100,000
-      //   ingestion_burst_size: 1,000,000
+      // extra_small_user: {
+      //   ingestion_rate: 10,000
+      //   ingestion_burst_size: 200,000
       //
       //   max_series_per_user:   0 (disabled)
       //   max_series_per_metric: 0 (disabled)
       //
-      //   max_global_series_per_user:   1,000,000
-      //   max_global_series_per_metric: 100,000
+      //   max_global_series_per_user:   100,000
+      //   max_global_series_per_metric: 20,000
       //
       //   max_series_per_query: 10,000
       //   max_samples_per_query: 100,000
       // },
 
+      small_user:: {
+        ingestion_rate: 100000,
+        ingestion_burst_size: 1000000,
+
+        max_series_per_user: 0,
+        max_series_per_metric: 0,
+
+        max_global_series_per_user: 1000000,
+        max_global_series_per_metric: 100000,
+
+        max_series_per_query: 10000,
+        max_samples_per_query: 100000,
+      },
+
       medium_user:: {
         max_series_per_metric: 0,  // Disabled in favour of the max global limit
         max_series_per_user: 0,  // Disabled in favour of the max global limit

cortex/distributor.libsonnet

@@ -29,8 +29,8 @@
       'server.grpc.keepalive.max-connection-idle': '1m',
 
       'distributor.ingestion-rate-limit-strategy': 'global',
-      'distributor.ingestion-rate-limit': 100000,  // 100K
-      'distributor.ingestion-burst-size': 1000000,  // 1M
+      'distributor.ingestion-rate-limit': 10000,  // 10K
+      'distributor.ingestion-burst-size': 200000,  // 200k
 
       // The ingestion rate global limit requires the distributors to form a ring.
       'distributor.ring.consul.hostname': 'consul.%s.svc.cluster.local:8500' % $._config.namespace,

cortex/ingester.libsonnet

@@ -22,8 +22,8 @@
 
       // Limits config.
       'ingester.max-chunk-idle': $._config.max_chunk_idle,
-      'ingester.max-global-series-per-user': 1000000,  // 1M
-      'ingester.max-global-series-per-metric': 100000,  // 100K
+      'ingester.max-global-series-per-user': 100000,  // 100K
+      'ingester.max-global-series-per-metric': 20000,  // 20K
       'ingester.max-series-per-user': 0,  // Disabled in favour of the max global limit
       'ingester.max-series-per-metric': 0,  // Disabled in favour of the max global limit
       'limits.per-user-override-config': '/etc/cortex/overrides.yaml',