Skip to content

Commit abb0806

Browse files
authored
Remove max_samples_per_query limit. (grafana#397)
* Remove max_samples_per_query limit. * Fixed CHANGELOG.md
1 parent e708d94 commit abb0806

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
* [CHANGE] Decreased blocks storage ingesters graceful termination period from 80m to 20m. #369
2727
* [CHANGE] Changed default `job_names` for query-frontend, query-scheduler and querier to match custom deployments too. #376
2828
* [CHANGE] Increase the rules per group and rule groups limits on different tiers. #396
29+
* [CHANGE] Removed `max_samples_per_query` limit, since it only works with chunks and only when using `-distributor.shard-by-all-labels=false`. #397
2930
* [ENHANCEMENT] Add overrides config to compactor. This allows setting retention configs per user. #386
3031
* [ENHANCEMENT] cortex-mixin: Make `cluster_namespace_deployment:kube_pod_container_resource_requests_{cpu_cores,memory_bytes}:sum` backwards compatible with `kube-state-metrics` v2.0.0. #317
3132
* [ENHANCEMENT] Cortex-mixin: Include `cortex-gw-internal` naming variation in default `gateway` job names. #328

cortex/config.libsonnet

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@
328328
'ingester.max-global-series-per-user': $._config.limits.max_global_series_per_user,
329329
'ingester.max-global-series-per-metric': $._config.limits.max_global_series_per_metric,
330330
'ingester.max-series-per-query': $._config.limits.max_series_per_query,
331-
'ingester.max-samples-per-query': $._config.limits.max_samples_per_query,
332331
},
333332
rulerLimitsConfig: {
334333
'ruler.max-rules-per-rule-group': $._config.limits.ruler_max_rules_per_rule_group,
@@ -352,7 +351,6 @@
352351
max_global_series_per_metric: 20000,
353352

354353
max_series_per_query: 100000,
355-
max_samples_per_query: 1000000,
356354

357355
ingestion_rate: 10000,
358356
ingestion_burst_size: 200000,
@@ -373,7 +371,6 @@
373371
max_global_series_per_metric: 30000,
374372

375373
max_series_per_query: 100000,
376-
max_samples_per_query: 1000000,
377374

378375
ingestion_rate: 30000,
379376
ingestion_burst_size: 300000,
@@ -391,7 +388,6 @@
391388
max_global_series_per_metric: 100000,
392389

393390
max_series_per_query: 100000,
394-
max_samples_per_query: 1000000,
395391

396392
ingestion_rate: 100000,
397393
ingestion_burst_size: 1000000,
@@ -409,7 +405,6 @@
409405
max_global_series_per_metric: 300000, // 300K
410406

411407
max_series_per_query: 100000,
412-
max_samples_per_query: 1000000,
413408

414409
ingestion_rate: 350000, // 350K
415410
ingestion_burst_size: 3500000, // 3.5M
@@ -424,7 +419,6 @@
424419
max_series_per_user: 0, // Disabled in favour of the max global limit
425420

426421
max_series_per_query: 100000,
427-
max_samples_per_query: 1000000,
428422

429423
max_global_series_per_user: 6000000, // 6M
430424
max_global_series_per_metric: 600000, // 600K
@@ -445,7 +439,6 @@
445439
max_global_series_per_metric: 1200000, // 1.2M
446440

447441
max_series_per_query: 100000,
448-
max_samples_per_query: 1000000,
449442

450443
ingestion_rate: 1500000, // 1.5M
451444
ingestion_burst_size: 15000000, // 15M
@@ -464,7 +457,6 @@
464457
max_global_series_per_metric: 1600000, // 1.6M
465458

466459
max_series_per_query: 100000,
467-
max_samples_per_query: 1000000,
468460

469461
ingestion_rate: 2250000, // 2.25M
470462
ingestion_burst_size: 22500000, // 22.5M

0 commit comments

Comments
 (0)