Skip to content

Commit

Permalink
sync config helps
Browse files Browse the repository at this point in the history
  • Loading branch information
francoposa committed Aug 20, 2024
1 parent 18bd3d8 commit cb6af7e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmd/mimir/config-descriptor.json
Original file line number Diff line number Diff line change
Expand Up @@ -1935,7 +1935,7 @@
"kind": "field",
"name": "max_concurrent",
"required": false,
"desc": "The number of workers running in each querier process. This setting limits the maximum number of concurrent queries in each querier. Minimum 4; lower values will be ignored and set to the minimum.",
"desc": "The number of workers running in each querier process. This setting limits the maximum number of concurrent queries in each querier. The minimum value is four; lower values are ignored and set to the minimum",
"fieldValue": null,
"fieldDefaultValue": 20,
"fieldFlag": "querier.max-concurrent",
Expand Down
2 changes: 1 addition & 1 deletion cmd/mimir/help-all.txt.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -1876,7 +1876,7 @@ Usage of ./cmd/mimir/mimir:
-querier.lookback-delta duration
Time since the last sample after which a time series is considered stale and ignored by expression evaluations. This config option should be set on query-frontend too when query sharding is enabled. (default 5m0s)
-querier.max-concurrent int
The number of workers running in each querier process. This setting limits the maximum number of concurrent queries in each querier. Minimum 4; lower values will be ignored and set to the minimum. (default 20)
The number of workers running in each querier process. This setting limits the maximum number of concurrent queries in each querier. The minimum value is four; lower values are ignored and set to the minimum (default 20)
-querier.max-estimated-fetched-chunks-per-query-multiplier float
[experimental] Maximum number of chunks estimated to be fetched in a single query from ingesters and store-gateways, as a multiple of -querier.max-fetched-chunks-per-query. This limit is enforced in the querier. Must be greater than or equal to 1, or 0 to disable.
-querier.max-estimated-memory-consumption-per-query uint
Expand Down
2 changes: 1 addition & 1 deletion cmd/mimir/help.txt.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ Usage of ./cmd/mimir/mimir:
-querier.label-values-max-cardinality-label-names-per-request int
Maximum number of label names allowed to be queried in a single /api/v1/cardinality/label_values API call. (default 100)
-querier.max-concurrent int
The number of workers running in each querier process. This setting limits the maximum number of concurrent queries in each querier. Minimum 4; lower values will be ignored and set to the minimum. (default 20)
The number of workers running in each querier process. This setting limits the maximum number of concurrent queries in each querier. The minimum value is four; lower values are ignored and set to the minimum (default 20)
-querier.max-fetched-chunk-bytes-per-query int
The maximum size of all chunks in bytes that a query can fetch from ingesters and store-gateways. This limit is enforced in the querier and ruler. 0 to disable.
-querier.max-fetched-chunks-per-query int
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1484,8 +1484,8 @@ store_gateway_client:
[enable_query_engine_fallback: <boolean> | default = true]
# The number of workers running in each querier process. This setting limits the
# maximum number of concurrent queries in each querier. The minimum value is four; lower values
# are ignored and set to the minimum.
# maximum number of concurrent queries in each querier. The minimum value is
# four; lower values are ignored and set to the minimum
# CLI flag: -querier.max-concurrent
[max_concurrent: <int> | default = 20]
Expand Down
2 changes: 1 addition & 1 deletion pkg/querier/engine/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
return help + "This config option should be set on query-frontend too when query sharding is enabled."
}

f.IntVar(&cfg.MaxConcurrent, "querier.max-concurrent", 20, "The number of workers running in each querier process. This setting limits the maximum number of concurrent queries in each querier. Minimum 4; lower values will be ignored and set to the minimum.")
f.IntVar(&cfg.MaxConcurrent, "querier.max-concurrent", 20, "The number of workers running in each querier process. This setting limits the maximum number of concurrent queries in each querier. The minimum value is four; lower values are ignored and set to the minimum")
f.DurationVar(&cfg.Timeout, "querier.timeout", 2*time.Minute, sharedWithQueryFrontend("The timeout for a query.")+" This also applies to queries evaluated by the ruler (internally or remotely).")
f.IntVar(&cfg.MaxSamples, "querier.max-samples", 50e6, sharedWithQueryFrontend("Maximum number of samples a single query can load into memory."))
f.DurationVar(&cfg.DefaultEvaluationInterval, "querier.default-evaluation-interval", time.Minute, sharedWithQueryFrontend("The default evaluation interval or step size for subqueries."))
Expand Down

0 comments on commit cb6af7e

Please sign in to comment.