diff --git a/CHANGELOG.md b/CHANGELOG.md index e30748666ae..af31ba60c9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * [CHANGE] Ingester: experimental `-blocks-storage.tsdb.new-chunk-disk-mapper` has been removed, new chunk disk mapper is now always used, and is no longer marked experimental. Default value of `-blocks-storage.tsdb.head-chunks-write-queue-size` has changed to 1000000, this enables async chunk queue by default, which leads to improved latency on the write path when new chunks are created in ingesters. #2762 * [CHANGE] Ingester: removed deprecated `-blocks-storage.tsdb.isolation-enabled` option. TSDB-level isolation is now always disabled in Mimir. #2782 * [CHANGE] Compactor: `-compactor.partial-block-deletion-delay` must either be set to 0 (to disable partial blocks deletion) or a value higher than `4h`. #2787 +* [CHANGE] Query-frontend: CLI flag `-query-frontend.align-querier-with-step` has been deprecated. Please use `-query-frontend.align-queries-with-step` instead. #2840 * [FEATURE] Introduced an experimental anonymous usage statistics tracking (disabled by default), to help Mimir maintainers make better decisions to support the open source community. The tracking system anonymously collects non-sensitive, non-personally identifiable information about the running Mimir cluster, and is disabled by default. #2643 #2662 #2685 #2732 #2733 #2735 * [FEATURE] Introduced an experimental deployment mode called read-write and running a fully featured Mimir cluster with three components: write, read and backend. The read-write deployment mode is a trade-off between the monolithic mode (only one component, no isolation) and the microservices mode (many components, high isolation). #2754 #2838 * [ENHANCEMENT] Distributor: Add `cortex_distributor_query_ingester_chunks_deduped_total` and `cortex_distributor_query_ingester_chunks_total` metrics for determining how effective ingester chunk deduplication at query time is. #2713 diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index d5541ea2f0b..a03be5bc58e 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -3691,7 +3691,7 @@ "desc": "Mutate incoming queries to align their start and end with their step.", "fieldValue": null, "fieldDefaultValue": false, - "fieldFlag": "query-frontend.align-querier-with-step", + "fieldFlag": "query-frontend.align-queries-with-step", "fieldType": "boolean" }, { diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl index 203457b3277..07831a4e397 100644 --- a/cmd/mimir/help-all.txt.tmpl +++ b/cmd/mimir/help-all.txt.tmpl @@ -1231,6 +1231,8 @@ Usage of ./cmd/mimir/mimir: -querier.timeout duration The timeout for a query. This config option should be set on query-frontend too when query sharding is enabled. This also applies to queries evaluated by the ruler (internally or remotely). (default 2m0s) -query-frontend.align-querier-with-step + Mutate incoming queries to align their start and end with their step. It has been deprecated. Please use -query-frontend.align-queries-with-step instead. + -query-frontend.align-queries-with-step Mutate incoming queries to align their start and end with their step. -query-frontend.cache-results Cache query results. diff --git a/cmd/mimir/help.txt.tmpl b/cmd/mimir/help.txt.tmpl index 2735affc008..b55063c39de 100644 --- a/cmd/mimir/help.txt.tmpl +++ b/cmd/mimir/help.txt.tmpl @@ -409,6 +409,8 @@ Usage of ./cmd/mimir/mimir: -querier.timeout duration The timeout for a query. This config option should be set on query-frontend too when query sharding is enabled. This also applies to queries evaluated by the ruler (internally or remotely). (default 2m0s) -query-frontend.align-querier-with-step + Mutate incoming queries to align their start and end with their step. It has been deprecated. Please use -query-frontend.align-queries-with-step instead. + -query-frontend.align-queries-with-step Mutate incoming queries to align their start and end with their step. -query-frontend.cache-results Cache query results. diff --git a/docs/sources/operators-guide/architecture/components/query-frontend/index.md b/docs/sources/operators-guide/architecture/components/query-frontend/index.md index da7a2e137ac..3762c6594c3 100644 --- a/docs/sources/operators-guide/architecture/components/query-frontend/index.md +++ b/docs/sources/operators-guide/architecture/components/query-frontend/index.md @@ -61,7 +61,7 @@ If the cached results are incomplete, the query-frontend calculates the required The query-frontend can optionally align queries with their step parameter to improve the cacheability of the query results. The result cache is backed by Memcached. -Although aligning the step parameter to the query time range increases the performance of Grafana Mimir, it violates the [PromQL conformance](https://prometheus.io/blog/2021/05/03/introducing-prometheus-conformance-program/) of Grafana Mimir. If PromQL conformance is not a priority to you, you can enable step alignment by setting `-query-frontend.align-querier-with-step=true`. +Although aligning the step parameter to the query time range increases the performance of Grafana Mimir, it violates the [PromQL conformance](https://prometheus.io/blog/2021/05/03/introducing-prometheus-conformance-program/) of Grafana Mimir. If PromQL conformance is not a priority to you, you can enable step alignment by setting `-query-frontend.align-queries-with-step=true`. ### About query sharding diff --git a/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md b/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md index 0fef7e2c753..a651f613b41 100644 --- a/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md +++ b/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md @@ -1060,7 +1060,7 @@ grpc_client_config: [split_queries_by_interval: | default = 24h] # Mutate incoming queries to align their start and end with their step. -# CLI flag: -query-frontend.align-querier-with-step +# CLI flag: -query-frontend.align-queries-with-step [align_queries_with_step: | default = false] results_cache: diff --git a/integration/query_frontend_cache_test.go b/integration/query_frontend_cache_test.go index 329548dcaf4..5e025f5ee26 100644 --- a/integration/query_frontend_cache_test.go +++ b/integration/query_frontend_cache_test.go @@ -38,17 +38,17 @@ func TestQueryFrontendUnalignedQuery(t *testing.T) { flags = mergeFlags(flags, map[string]string{ "-query-frontend.cache-results": "true", "-query-frontend.split-queries-by-interval": "2m", - "-query-frontend.align-querier-with-step": "true", + "-query-frontend.align-queries-with-step": "true", "-query-frontend.max-cache-freshness": "0", // Cache everything. "-query-frontend.results-cache.backend": "memcached", "-query-frontend.results-cache.memcached.addresses": "dns+" + memcached.NetworkEndpoint(e2ecache.MemcachedPort), }) // Start the query-frontend. - queryFrontendAligned := e2emimir.NewQueryFrontend("query-frontend-aligned", mergeFlags(flags, map[string]string{"-query-frontend.align-querier-with-step": "true"}), e2emimir.WithConfigFile(configFile)) + queryFrontendAligned := e2emimir.NewQueryFrontend("query-frontend-aligned", mergeFlags(flags, map[string]string{"-query-frontend.align-queries-with-step": "true"}), e2emimir.WithConfigFile(configFile)) require.NoError(t, s.Start(queryFrontendAligned)) - queryFrontendUnaligned := e2emimir.NewQueryFrontend("query-frontend-unaligned", mergeFlags(flags, map[string]string{"-query-frontend.align-querier-with-step": "false"}), e2emimir.WithConfigFile(configFile)) + queryFrontendUnaligned := e2emimir.NewQueryFrontend("query-frontend-unaligned", mergeFlags(flags, map[string]string{"-query-frontend.align-queries-with-step": "false"}), e2emimir.WithConfigFile(configFile)) require.NoError(t, s.Start(queryFrontendUnaligned)) querierAligned := e2emimir.NewQuerier("querier-aligned", consul.NetworkHTTPEndpoint(), mergeFlags(flags, map[string]string{"-querier.frontend-address": queryFrontendAligned.NetworkGRPCEndpoint()}), e2emimir.WithConfigFile(configFile)) diff --git a/operations/mimir-tests/test-autoscaling-generated.yaml b/operations/mimir-tests/test-autoscaling-generated.yaml index 75e5a97ccd2..8388bb17192 100644 --- a/operations/mimir-tests/test-autoscaling-generated.yaml +++ b/operations/mimir-tests/test-autoscaling-generated.yaml @@ -644,7 +644,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached @@ -963,7 +963,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=false - -query-frontend.max-cache-freshness=10m - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local:9095 diff --git a/operations/mimir-tests/test-consul-generated.yaml b/operations/mimir-tests/test-consul-generated.yaml index a1813e2129b..54848210bc0 100644 --- a/operations/mimir-tests/test-consul-generated.yaml +++ b/operations/mimir-tests/test-consul-generated.yaml @@ -934,7 +934,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-consul-multi-zone-generated.yaml b/operations/mimir-tests/test-consul-multi-zone-generated.yaml index 9e8bf6c1439..c8c47ac9991 100644 --- a/operations/mimir-tests/test-consul-multi-zone-generated.yaml +++ b/operations/mimir-tests/test-consul-multi-zone-generated.yaml @@ -1087,7 +1087,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-consul-ruler-disabled-generated.yaml b/operations/mimir-tests/test-consul-ruler-disabled-generated.yaml index 6adddc3041f..b0f4a003757 100644 --- a/operations/mimir-tests/test-consul-ruler-disabled-generated.yaml +++ b/operations/mimir-tests/test-consul-ruler-disabled-generated.yaml @@ -916,7 +916,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-defaults-generated.yaml b/operations/mimir-tests/test-defaults-generated.yaml index 634db55b327..c0fde9cfc9e 100644 --- a/operations/mimir-tests/test-defaults-generated.yaml +++ b/operations/mimir-tests/test-defaults-generated.yaml @@ -514,7 +514,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml b/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml index da287a639ea..2ac61bcac6d 100644 --- a/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml +++ b/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml @@ -568,7 +568,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-extra-runtime-config-generated.yaml b/operations/mimir-tests/test-extra-runtime-config-generated.yaml index b09fdca9534..c7d3ce47cf7 100644 --- a/operations/mimir-tests/test-extra-runtime-config-generated.yaml +++ b/operations/mimir-tests/test-extra-runtime-config-generated.yaml @@ -585,7 +585,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-helm-parity-generated.yaml b/operations/mimir-tests/test-helm-parity-generated.yaml index 50f4fcf33de..8ac8ea90a6c 100644 --- a/operations/mimir-tests/test-helm-parity-generated.yaml +++ b/operations/mimir-tests/test-helm-parity-generated.yaml @@ -638,7 +638,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-0-before-generated.yaml b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-0-before-generated.yaml index 74789d147d9..22c44a730a4 100644 --- a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-0-before-generated.yaml +++ b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-0-before-generated.yaml @@ -567,7 +567,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-1-generated.yaml b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-1-generated.yaml index cfa78ddc8e0..36905fb61e8 100644 --- a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-1-generated.yaml +++ b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-1-generated.yaml @@ -569,7 +569,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-2-generated.yaml b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-2-generated.yaml index 346a9a7607f..2e81d9b1722 100644 --- a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-2-generated.yaml +++ b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-2-generated.yaml @@ -571,7 +571,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-3-generated.yaml b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-3-generated.yaml index f678f7abec5..8c0ca8fc2a0 100644 --- a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-3-generated.yaml +++ b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-3-generated.yaml @@ -569,7 +569,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-migration-step-0-before-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-0-before-generated.yaml index a1813e2129b..54848210bc0 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-0-before-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-0-before-generated.yaml @@ -934,7 +934,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-migration-step-1-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-1-generated.yaml index d1ab3c89395..2ed89c7d1d1 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-1-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-1-generated.yaml @@ -988,7 +988,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-migration-step-2-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-2-generated.yaml index 253379c9e10..f00f73f0b67 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-2-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-2-generated.yaml @@ -988,7 +988,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-migration-step-3-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-3-generated.yaml index 6e01d2f6bc5..331bf3676b8 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-3-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-3-generated.yaml @@ -988,7 +988,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-migration-step-4-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-4-generated.yaml index 9463b1ceb7e..c509be7642d 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-4-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-4-generated.yaml @@ -988,7 +988,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-migration-step-5-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-5-generated.yaml index d032b22373b..306a7c4d9a9 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-5-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-5-generated.yaml @@ -570,7 +570,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-memberlist-migration-step-6-final-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-6-final-generated.yaml index 74789d147d9..22c44a730a4 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-6-final-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-6-final-generated.yaml @@ -567,7 +567,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-multi-zone-generated.yaml b/operations/mimir-tests/test-multi-zone-generated.yaml index eae27c7212a..60c7a48f5e6 100644 --- a/operations/mimir-tests/test-multi-zone-generated.yaml +++ b/operations/mimir-tests/test-multi-zone-generated.yaml @@ -732,7 +732,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-multi-zone-with-ongoing-migration-generated.yaml b/operations/mimir-tests/test-multi-zone-with-ongoing-migration-generated.yaml index d321f9af439..427ca87ca3a 100644 --- a/operations/mimir-tests/test-multi-zone-with-ongoing-migration-generated.yaml +++ b/operations/mimir-tests/test-multi-zone-with-ongoing-migration-generated.yaml @@ -800,7 +800,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-query-sharding-generated.yaml b/operations/mimir-tests/test-query-sharding-generated.yaml index 225812effc0..4c1bd503198 100644 --- a/operations/mimir-tests/test-query-sharding-generated.yaml +++ b/operations/mimir-tests/test-query-sharding-generated.yaml @@ -568,7 +568,7 @@ spec: containers: - args: - -querier.max-query-parallelism=240 - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.parallelize-shardable-queries=true diff --git a/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml b/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml index cb7c4f9a161..5655ca02155 100644 --- a/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml +++ b/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml @@ -645,7 +645,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached @@ -965,7 +965,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=false - -query-frontend.max-cache-freshness=10m - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local:9095 diff --git a/operations/mimir-tests/test-ruler-remote-evaluation-migration-generated.yaml b/operations/mimir-tests/test-ruler-remote-evaluation-migration-generated.yaml index e9536e86176..d5aacf8460f 100644 --- a/operations/mimir-tests/test-ruler-remote-evaluation-migration-generated.yaml +++ b/operations/mimir-tests/test-ruler-remote-evaluation-migration-generated.yaml @@ -645,7 +645,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached @@ -964,7 +964,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=false - -query-frontend.max-cache-freshness=10m - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local:9095 diff --git a/operations/mimir-tests/test-shuffle-sharding-generated.yaml b/operations/mimir-tests/test-shuffle-sharding-generated.yaml index 704ca688bb5..1908577e426 100644 --- a/operations/mimir-tests/test-shuffle-sharding-generated.yaml +++ b/operations/mimir-tests/test-shuffle-sharding-generated.yaml @@ -570,7 +570,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.max-queriers-per-tenant=10 diff --git a/operations/mimir-tests/test-shuffle-sharding-read-path-disabled-generated.yaml b/operations/mimir-tests/test-shuffle-sharding-read-path-disabled-generated.yaml index ec43a9a8018..f761d31ed5b 100644 --- a/operations/mimir-tests/test-shuffle-sharding-read-path-disabled-generated.yaml +++ b/operations/mimir-tests/test-shuffle-sharding-read-path-disabled-generated.yaml @@ -570,7 +570,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.max-queriers-per-tenant=10 diff --git a/operations/mimir-tests/test-storage-azure-generated.yaml b/operations/mimir-tests/test-storage-azure-generated.yaml index 13be9efba34..6b20ec22288 100644 --- a/operations/mimir-tests/test-storage-azure-generated.yaml +++ b/operations/mimir-tests/test-storage-azure-generated.yaml @@ -569,7 +569,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-storage-gcs-generated.yaml b/operations/mimir-tests/test-storage-gcs-generated.yaml index 74789d147d9..22c44a730a4 100644 --- a/operations/mimir-tests/test-storage-gcs-generated.yaml +++ b/operations/mimir-tests/test-storage-gcs-generated.yaml @@ -567,7 +567,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-storage-s3-generated.yaml b/operations/mimir-tests/test-storage-s3-generated.yaml index ffbe10da6a6..179b279d77e 100644 --- a/operations/mimir-tests/test-storage-s3-generated.yaml +++ b/operations/mimir-tests/test-storage-s3-generated.yaml @@ -568,7 +568,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir-tests/test-without-query-scheduler-generated.yaml b/operations/mimir-tests/test-without-query-scheduler-generated.yaml index 8e7be2f4393..ff75237b77d 100644 --- a/operations/mimir-tests/test-without-query-scheduler-generated.yaml +++ b/operations/mimir-tests/test-without-query-scheduler-generated.yaml @@ -476,7 +476,7 @@ spec: spec: containers: - args: - - -query-frontend.align-querier-with-step=false + - -query-frontend.align-queries-with-step=false - -query-frontend.cache-results=true - -query-frontend.max-cache-freshness=10m - -query-frontend.results-cache.backend=memcached diff --git a/operations/mimir/query-frontend.libsonnet b/operations/mimir/query-frontend.libsonnet index 32886a491c9..83ded6084de 100644 --- a/operations/mimir/query-frontend.libsonnet +++ b/operations/mimir/query-frontend.libsonnet @@ -13,7 +13,7 @@ 'server.http-write-timeout': '1m', // Cache query results. - 'query-frontend.align-querier-with-step': false, + 'query-frontend.align-queries-with-step': false, 'query-frontend.cache-results': true, 'query-frontend.results-cache.backend': 'memcached', 'query-frontend.results-cache.memcached.addresses': 'dnssrvnoa+memcached-frontend.%(namespace)s.svc.cluster.local:11211' % $._config, diff --git a/pkg/frontend/querymiddleware/roundtrip.go b/pkg/frontend/querymiddleware/roundtrip.go index 9de2961f29c..caad8686940 100644 --- a/pkg/frontend/querymiddleware/roundtrip.go +++ b/pkg/frontend/querymiddleware/roundtrip.go @@ -49,7 +49,9 @@ type Config struct { func (cfg *Config) RegisterFlags(f *flag.FlagSet) { f.IntVar(&cfg.MaxRetries, "query-frontend.max-retries-per-request", 5, "Maximum number of retries for a single request; beyond this, the downstream error is returned.") f.DurationVar(&cfg.SplitQueriesByInterval, "query-frontend.split-queries-by-interval", 24*time.Hour, "Split range queries by an interval and execute in parallel. You should use a multiple of 24 hours to optimize querying blocks. 0 to disable it.") - f.BoolVar(&cfg.AlignQueriesWithStep, "query-frontend.align-querier-with-step", false, "Mutate incoming queries to align their start and end with their step.") + f.BoolVar(&cfg.AlignQueriesWithStep, "query-frontend.align-queries-with-step", false, "Mutate incoming queries to align their start and end with their step.") + // TODO: Remove it in Mimir 2.6.0. + f.BoolVar(&cfg.AlignQueriesWithStep, "query-frontend.align-querier-with-step", false, "Mutate incoming queries to align their start and end with their step. It has been deprecated. Please use -query-frontend.align-queries-with-step instead.") f.BoolVar(&cfg.CacheResults, "query-frontend.cache-results", false, "Cache query results.") f.BoolVar(&cfg.ShardedQueries, "query-frontend.parallelize-shardable-queries", false, "True to enable query sharding.") f.BoolVar(&cfg.CacheUnalignedRequests, "query-frontend.cache-unaligned-requests", false, "Cache requests that are not step-aligned.")