Skip to content

Commit 107d2a6

Browse files
authored
ci: add checking json schema (#7365)
* ci: add checking json schema Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> * fix changelog Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> --------- Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>
1 parent 8b79727 commit 107d2a6

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changelog
22

33
## master / unreleased
4-
* [ENHANCEMENT] Cache: Add per-tenant TTL configuration for query results cache to control cache expiration on a per-tenant basis with separate TTLs for regular and out-of-order data. #5039
4+
* [ENHANCEMENT] Cache: Add per-tenant TTL configuration for query results cache to control cache expiration on a per-tenant basis with separate TTLs for regular and out-of-order data. #7357
55

66
## 1.21.0 in progress
77

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ clean-doc:
293293
./docs/guides/encryption-at-rest.md
294294

295295
check-doc: doc
296-
@git diff --exit-code -- ./docs/configuration/config-file-reference.md ./docs/blocks-storage/*.md ./docs/configuration/*.md
296+
@git diff --exit-code -- ./docs/configuration/config-file-reference.md ./docs/blocks-storage/*.md ./docs/configuration/*.md ./schemas/cortex-config-schema.json
297297

298298
clean-white-noise:
299299
@find . -path ./.pkg -prune -o -path ./vendor -prune -o -path ./website -prune -or -type f -name "*.md" -print | \

schemas/cortex-config-schema.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5363,6 +5363,13 @@
53635363
"type": "number",
53645364
"x-cli-flag": "distributor.native-histogram-ingestion-rate-limit"
53655365
},
5366+
"out_of_order_results_cache_ttl": {
5367+
"default": "0s",
5368+
"description": "Per-tenant TTL for cached query results that overlap with the out-of-order time window. These results may still receive out-of-order samples, so they typically use a shorter TTL. 0 (default) means use the global cache backend TTL configuration.",
5369+
"type": "string",
5370+
"x-cli-flag": "frontend.out-of-order-results-cache-ttl",
5371+
"x-format": "duration"
5372+
},
53665373
"out_of_order_time_window": {
53675374
"default": "0s",
53685375
"description": "[Experimental] Configures the allowed time window for ingestion of out-of-order samples. Disabled (0s) by default.",
@@ -5487,6 +5494,13 @@
54875494
"x-cli-flag": "validation.reject-old-samples.max-age",
54885495
"x-format": "duration"
54895496
},
5497+
"results_cache_ttl": {
5498+
"default": "0s",
5499+
"description": "Per-tenant TTL for cached query results in the cache backend (Memcached/Redis/FIFO). This is the standard TTL for results that do not overlap with the out-of-order time window. 0 (default) means use the global cache backend TTL configuration.",
5500+
"type": "string",
5501+
"x-cli-flag": "frontend.results-cache-ttl",
5502+
"x-format": "duration"
5503+
},
54905504
"ruler_evaluation_delay_duration": {
54915505
"default": "0s",
54925506
"description": "Deprecated(use ruler.query-offset instead) and will be removed in v1.19.0: Duration to delay the evaluation of rules to ensure the underlying metrics have been pushed to Cortex.",

0 commit comments

Comments
 (0)