Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove max_samples_per_query limit. #397

Merged
merged 2 commits into from
Sep 16, 2021
Merged

Remove max_samples_per_query limit. #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9960b1b
Remove max_samples_per_query limit.
pstibrany Sep 16, 2021
06d8975
Fixed CHANGELOG.md
pstibrany Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
* [CHANGE] Decreased blocks storage ingesters graceful termination period from 80m to 20m. #369
* [CHANGE] Changed default `job_names` for query-frontend, query-scheduler and querier to match custom deployments too. #376
* [CHANGE] Increase the rules per group and rule groups limits on different tiers. #396
* [CHANGE] Removed `max_samples_per_query` limit, since it only works with chunks and only when using `-distributor.shard-by-all-labels=false`. #397
* [ENHANCEMENT] Add overrides config to compactor. This allows setting retention configs per user. #386
* [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
* [ENHANCEMENT] Cortex-mixin: Include `cortex-gw-internal` naming variation in default `gateway` job names. #328
Expand Down
8 changes: 0 additions & 8 deletions cortex/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@
'ingester.max-global-series-per-user': $._config.limits.max_global_series_per_user,
'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,
},
rulerLimitsConfig: {
'ruler.max-rules-per-rule-group': $._config.limits.ruler_max_rules_per_rule_group,
Expand All @@ -352,7 +351,6 @@
max_global_series_per_metric: 20000,

max_series_per_query: 100000,
max_samples_per_query: 1000000,

ingestion_rate: 10000,
ingestion_burst_size: 200000,
Expand All @@ -373,7 +371,6 @@
max_global_series_per_metric: 30000,

max_series_per_query: 100000,
max_samples_per_query: 1000000,

ingestion_rate: 30000,
ingestion_burst_size: 300000,
Expand All @@ -391,7 +388,6 @@
max_global_series_per_metric: 100000,

max_series_per_query: 100000,
max_samples_per_query: 1000000,

ingestion_rate: 100000,
ingestion_burst_size: 1000000,
Expand All @@ -409,7 +405,6 @@
max_global_series_per_metric: 300000, // 300K

max_series_per_query: 100000,
max_samples_per_query: 1000000,

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

max_series_per_query: 100000,
max_samples_per_query: 1000000,

max_global_series_per_user: 6000000, // 6M
max_global_series_per_metric: 600000, // 600K
Expand All @@ -445,7 +439,6 @@
max_global_series_per_metric: 1200000, // 1.2M

max_series_per_query: 100000,
max_samples_per_query: 1000000,

ingestion_rate: 1500000, // 1.5M
ingestion_burst_size: 15000000, // 15M
Expand All @@ -464,7 +457,6 @@
max_global_series_per_metric: 1600000, // 1.6M

max_series_per_query: 100000,
max_samples_per_query: 1000000,

ingestion_rate: 2250000, // 2.25M
ingestion_burst_size: 22500000, // 22.5M
Expand Down