Skip to content

Commit 12fda45

Browse files
authored
Merge pull request grafana/cortex-jsonnet#304 from grafana/change-overrides-flag
Do not use deprecated flag -limits.per-user-override-config
2 parents f5c771a + f7b54f2 commit 12fda45

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

operations/mimir/config.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198

199199
// Shared between the Ruler and Querier
200200
queryConfig: {
201-
'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
201+
'runtime-config.file': '/etc/cortex/overrides.yaml',
202202

203203
// Limit the size of the rows we read from the index.
204204
'store.cardinality-limit': 1e6,

operations/mimir/distributor.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
'validation.reject-old-samples': true,
1313
'validation.reject-old-samples.max-age': '12h',
14-
'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
14+
'runtime-config.file': '/etc/cortex/overrides.yaml',
1515
'distributor.remote-timeout': '20s',
1616

1717
'distributor.ha-tracker.enable': true,

operations/mimir/ingester.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
'ingester.max-global-series-per-metric': $._config.limits.max_global_series_per_metric,
3131
'ingester.max-series-per-query': $._config.limits.max_series_per_query,
3232
'ingester.max-samples-per-query': $._config.limits.max_samples_per_query,
33-
'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
33+
'runtime-config.file': '/etc/cortex/overrides.yaml',
3434
'server.grpc-max-concurrent-streams': 100000,
3535
} + (
3636
if $._config.memcached_index_writes_enabled then

operations/mimir/query-frontend.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
// Limit queries to 500 days, allow this to be override per-user.
3737
'store.max-query-length': '12000h', // 500 Days
38-
'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
38+
'runtime-config.file': '/etc/cortex/overrides.yaml',
3939
} + (
4040
if $._config.queryFrontend.sharded_queries_enabled then
4141
{

operations/mimir/tsdb.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
$._config.queryBlocksStorageConfig +
208208
{
209209
target: 'store-gateway',
210-
'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
210+
'runtime-config.file': '/etc/cortex/overrides.yaml',
211211

212212
// Persist ring tokens so that when the store-gateway will be restarted
213213
// it will pick the same tokens

0 commit comments

Comments
 (0)