Skip to content

Commit 7835190

Browse files
committed
Updated config description
Signed-off-by: Justin Jung <[email protected]>
1 parent 7eaedfa commit 7835190

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* [ENHANCEMENT] Index Cache: Multi level cache adds config `max_backfill_items` to cap max items to backfill per async operation. #5686
1717
* [ENHANCEMENT] Query Frontend: Log number of split queries in `query stats` log. #5703
1818
* [ENHANCEMENT] Logging: Added new options for logging HTTP request headers: `-server.log-request-headers` enables logging HTTP request headers, `-server.log-request-headers-exclude-list` allows users to specify headers which should not be logged. #5744
19-
* [ENHANCEMENT] Query Frontend/Scheduler: Time check in query priority now considers range selectors, modifiers and lookback delta. #5758
19+
* [ENHANCEMENT] Query Frontend/Scheduler: Time check in query priority now considers overall data fetched time window (including range selectors, modifiers and lookback delta). #5758
2020
* [ENHANCEMENT] Querier: Added `querier.store-gateway-query-stats-enabled` to enable or disable store gateway query stats log. #5749
2121
* [BUGFIX] Distributor: Do not use label with empty values for sharding #5717
2222
* [BUGFIX] Query Frontend: queries with negative offset should check whether it is cacheable or not. #5719

docs/configuration/config-file-reference.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5095,16 +5095,17 @@ otel:
50955095
# Regex that the query string should match. If not set, it won't be checked.
50965096
[regex: <string> | default = ""]
50975097
5098-
# Time window that the evaluated query (including range selectors, modifiers and
5099-
# lookback delta) should be within. If not set, it won't be checked.
5098+
# Overall data fetch time window (including range selectors, modifiers and
5099+
# lookback delta) that the query should be within. If not set, it won't be
5100+
# checked.
51005101
time_window:
5101-
# Start of the time window that the evaluated query (including range
5102-
# selectors, modifiers and lookback delta) should be within. If set to 0, it
5103-
# won't be checked.
5102+
# Start of the data fetch time window (including range selectors, modifiers
5103+
# and lookback delta) that the query should be within. If set to 0, it won't
5104+
# be checked.
51045105
[start: <int> | default = 0]
51055106
5106-
# End of the time window that the evaluated query (including range selectors,
5107-
# modifiers and lookback delta) should be within. If set to 0, it won't be
5107+
# End of the data fetch time window (including range selectors, modifiers and
5108+
# lookback delta) that the query should be within. If set to 0, it won't be
51085109
# checked.
51095110
[end: <int> | default = 0]
51105111
```

pkg/util/validation/limits.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ type PriorityDef struct {
6464

6565
type QueryAttribute struct {
6666
Regex string `yaml:"regex" json:"regex" doc:"nocli|description=Regex that the query string should match. If not set, it won't be checked."`
67-
TimeWindow TimeWindow `yaml:"time_window" json:"time_window" doc:"nocli|description=Time window that the evaluated query (including range selectors, modifiers and lookback delta) should be within. If not set, it won't be checked."`
67+
TimeWindow TimeWindow `yaml:"time_window" json:"time_window" doc:"nocli|description=Overall data fetch time window (including range selectors, modifiers and lookback delta) that the query should be within. If not set, it won't be checked."`
6868
CompiledRegex *regexp.Regexp
6969
}
7070

7171
type TimeWindow struct {
72-
Start model.Duration `yaml:"start" json:"start" doc:"nocli|description=Start of the time window that the evaluated query (including range selectors, modifiers and lookback delta) should be within. If set to 0, it won't be checked.|default=0"`
73-
End model.Duration `yaml:"end" json:"end" doc:"nocli|description=End of the time window that the evaluated query (including range selectors, modifiers and lookback delta) should be within. If set to 0, it won't be checked.|default=0"`
72+
Start model.Duration `yaml:"start" json:"start" doc:"nocli|description=Start of the data fetch time window (including range selectors, modifiers and lookback delta) that the query should be within. If set to 0, it won't be checked.|default=0"`
73+
End model.Duration `yaml:"end" json:"end" doc:"nocli|description=End of the data fetch time window (including range selectors, modifiers and lookback delta) that the query should be within. If set to 0, it won't be checked.|default=0"`
7474
}
7575

7676
// Limits describe all the limits for users; can be used to describe global default

0 commit comments

Comments
 (0)