Merge pull request grafana/cortex-jsonnet#304 from grafana/change-ove…

…rrides-flag Do not use deprecated flag -limits.per-user-override-config
grafana · May 12, 2021 · 12fda45 · 12fda45
2 parents f5c771a + f7b54f2
commit 12fda45
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/operations/mimir/config.libsonnet b/operations/mimir/config.libsonnet
@@ -198,7 +198,7 @@
 
     // Shared between the Ruler and Querier
     queryConfig: {
-      'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
+      'runtime-config.file': '/etc/cortex/overrides.yaml',
 
       // Limit the size of the rows we read from the index.
       'store.cardinality-limit': 1e6,

diff --git a/operations/mimir/distributor.libsonnet b/operations/mimir/distributor.libsonnet
@@ -11,7 +11,7 @@
 
       'validation.reject-old-samples': true,
       'validation.reject-old-samples.max-age': '12h',
-      'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
+      'runtime-config.file': '/etc/cortex/overrides.yaml',
       'distributor.remote-timeout': '20s',
 
       'distributor.ha-tracker.enable': true,

diff --git a/operations/mimir/ingester.libsonnet b/operations/mimir/ingester.libsonnet
@@ -30,7 +30,7 @@
       'ingester.max-global-series-per-metric': $._config.limits.max_global_series_per_metric,
       'ingester.max-series-per-query': $._config.limits.max_series_per_query,
       'ingester.max-samples-per-query': $._config.limits.max_samples_per_query,
-      'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
+      'runtime-config.file': '/etc/cortex/overrides.yaml',
       'server.grpc-max-concurrent-streams': 100000,
     } + (
       if $._config.memcached_index_writes_enabled then

diff --git a/operations/mimir/query-frontend.libsonnet b/operations/mimir/query-frontend.libsonnet
@@ -35,7 +35,7 @@
 
       // Limit queries to 500 days, allow this to be override per-user.
       'store.max-query-length': '12000h',  // 500 Days
-      'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
+      'runtime-config.file': '/etc/cortex/overrides.yaml',
     } + (
       if $._config.queryFrontend.sharded_queries_enabled then
         {

diff --git a/operations/mimir/tsdb.libsonnet b/operations/mimir/tsdb.libsonnet
@@ -207,7 +207,7 @@
     $._config.queryBlocksStorageConfig +
     {
       target: 'store-gateway',
-      'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
+      'runtime-config.file': '/etc/cortex/overrides.yaml',
 
       // Persist ring tokens so that when the store-gateway will be restarted
       // it will pick the same tokens