Skip to content

Commit 05903b4

Browse files
committed
Implementy max_fetched_data_bytes_per_query limit
Signed-off-by: 🌲 Harry 🌊 John 🏔 <[email protected]>
1 parent 48bc900 commit 05903b4

File tree

17 files changed

+467
-185
lines changed

17 files changed

+467
-185
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
* [FEATURE] Added `-api.http-request-headers-to-log` allowing for the addition of HTTP Headers to logs #4803
5656
* [FEATURE] Distributor: Added a new limit `-validation.max-labels-size-bytes` allowing to limit the combined size of labels for each timeseries. #4848
5757
* [FEATURE] Storage/Bucket: Added `-*.s3.bucket-lookup-type` allowing to configure the s3 bucket lookup type. #4794
58+
* [FEATURE] Querier: Added a new limit `-querier.max-fetched-data-bytes-per-query` allowing to limit the maximum size of all data in bytes that a query can fetch from each ingester and storage. #4854
5859
* [BUGFIX] Memberlist: Add join with no retrying when starting service. #4804
5960
* [BUGFIX] Ruler: Fix /ruler/rule_groups returns YAML with extra fields. #4767
6061

docs/configuration/config-file-reference.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2673,12 +2673,19 @@ The `limits_config` configures default and per-tenant limits imposed by Cortex s
26732673
# CLI flag: -querier.max-fetched-series-per-query
26742674
[max_fetched_series_per_query: <int> | default = 0]
26752675
2676-
# The maximum size of all chunks in bytes that a query can fetch from each
2677-
# ingester and storage. This limit is enforced in the querier and ruler only
2678-
# when running Cortex with blocks storage. 0 to disable.
2676+
# Deprecated (user max-fetched-data-bytes-per-query instead): The maximum size
2677+
# of all chunks in bytes that a query can fetch from each ingester and storage.
2678+
# This limit is enforced in the querier and ruler only when running Cortex with
2679+
# blocks storage. 0 to disable.
26792680
# CLI flag: -querier.max-fetched-chunk-bytes-per-query
26802681
[max_fetched_chunk_bytes_per_query: <int> | default = 0]
26812682
2683+
# The maximum combined size of all data that a query can fetch from each
2684+
# ingester and storage. This limit is enforced in the querier and ruler only
2685+
# when running Cortex with blocks storage. 0 to disable.
2686+
# CLI flag: -querier.max-fetched-data-bytes-per-query
2687+
[max_fetched_data_bytes_per_query: <int> | default = 0]
2688+
26822689
# Limit how long back data (series and metadata) can be queried, up until
26832690
# <lookback> duration ago. This limit is enforced in the query-frontend, querier
26842691
# and ruler. If the requested time range is outside the allowed range, the

0 commit comments

Comments
 (0)