diff --git a/operations/mimir-tests/test-autoscaling-custom-target-utilization-generated.yaml b/operations/mimir-tests/test-autoscaling-custom-target-utilization-generated.yaml index 4702a144fb1..8f77d3e575d 100644 --- a/operations/mimir-tests/test-autoscaling-custom-target-utilization-generated.yaml +++ b/operations/mimir-tests/test-autoscaling-custom-target-utilization-generated.yaml @@ -1155,7 +1155,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-autoscaling-generated.yaml b/operations/mimir-tests/test-autoscaling-generated.yaml index 94a021f2ea9..8f363a2901f 100644 --- a/operations/mimir-tests/test-autoscaling-generated.yaml +++ b/operations/mimir-tests/test-autoscaling-generated.yaml @@ -1155,7 +1155,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml b/operations/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml index bbcf457ac3c..6c0780198cd 100644 --- a/operations/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml @@ -1509,7 +1509,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-autoscaling-multiple-triggers-generated.yaml b/operations/mimir-tests/test-ingest-storage-autoscaling-multiple-triggers-generated.yaml index 57931456359..41dcf23a9a5 100644 --- a/operations/mimir-tests/test-ingest-storage-autoscaling-multiple-triggers-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-autoscaling-multiple-triggers-generated.yaml @@ -1509,7 +1509,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-autoscaling-one-trigger-generated.yaml b/operations/mimir-tests/test-ingest-storage-autoscaling-one-trigger-generated.yaml index aacb9b93c45..32663acef16 100644 --- a/operations/mimir-tests/test-ingest-storage-autoscaling-one-trigger-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-autoscaling-one-trigger-generated.yaml @@ -1509,7 +1509,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-0-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-0-generated.yaml index 161288888bf..e3a60d008fc 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-0-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-0-generated.yaml @@ -1409,7 +1409,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-1-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-1-generated.yaml index 59067c3c2ca..70354b7223c 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-1-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-1-generated.yaml @@ -1482,7 +1482,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-10-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-10-generated.yaml index f400e417758..62695e33d49 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-10-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-10-generated.yaml @@ -1486,7 +1486,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-11-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-11-generated.yaml index 722393f506c..524333cc6a0 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-11-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-11-generated.yaml @@ -1486,7 +1486,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-2-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-2-generated.yaml index 9877112ac74..655ee168055 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-2-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-2-generated.yaml @@ -1495,7 +1495,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-3-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-3-generated.yaml index 21bc9822aa4..4f968e6020a 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-3-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-3-generated.yaml @@ -1517,7 +1517,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-4-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-4-generated.yaml index 2ddc84c047f..353d23827f3 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-4-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-4-generated.yaml @@ -1515,7 +1515,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-5a-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-5a-generated.yaml index 8a8e193891a..41dc2fce71b 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-5a-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-5a-generated.yaml @@ -1515,7 +1515,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-5b-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-5b-generated.yaml index 6cf7cbfd8b2..10b92ad726f 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-5b-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-5b-generated.yaml @@ -1515,7 +1515,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-6-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-6-generated.yaml index 787a118ff9a..537415fa93f 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-6-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-6-generated.yaml @@ -1446,7 +1446,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-7-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-7-generated.yaml index 72e33dc28c7..497fc7eb2b5 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-7-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-7-generated.yaml @@ -1450,7 +1450,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-8-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-8-generated.yaml index f58041dacba..a068fceec16 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-8-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-8-generated.yaml @@ -1450,7 +1450,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-9-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-9-generated.yaml index d4b05529b95..ff1a427be75 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-9-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-9-generated.yaml @@ -1427,7 +1427,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-final-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-final-generated.yaml index 3d7b7acd578..f04144ae5a8 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-final-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-final-generated.yaml @@ -1509,7 +1509,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-query-scheduler-memberlist-ring-and-ruler-remote-evaluation-generated.yaml b/operations/mimir-tests/test-query-scheduler-memberlist-ring-and-ruler-remote-evaluation-generated.yaml index d98a5d826c9..3cf0e1e8ade 100644 --- a/operations/mimir-tests/test-query-scheduler-memberlist-ring-and-ruler-remote-evaluation-generated.yaml +++ b/operations/mimir-tests/test-query-scheduler-memberlist-ring-and-ruler-remote-evaluation-generated.yaml @@ -1206,7 +1206,6 @@ spec: - -query-scheduler.ring.store=memberlist - -query-scheduler.service-discovery-mode=ring - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml b/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml index 22782cc2f21..572cae4457b 100644 --- a/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml +++ b/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml @@ -1161,7 +1161,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m 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 0ecd6fd7058..5d0e13b95aa 100644 --- a/operations/mimir-tests/test-ruler-remote-evaluation-migration-generated.yaml +++ b/operations/mimir-tests/test-ruler-remote-evaluation-migration-generated.yaml @@ -1159,7 +1159,6 @@ spec: - -query-frontend.results-cache.memcached.timeout=500ms - -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095 - -runtime-config.file=/etc/mimir/overrides.yaml - - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc-max-send-msg-size-bytes=104857600 - -server.grpc.keepalive.max-connection-age=30s - -server.grpc.keepalive.max-connection-age-grace=5m diff --git a/operations/mimir/ruler-remote-evaluation.libsonnet b/operations/mimir/ruler-remote-evaluation.libsonnet index 4d856ab37cf..033c1e44527 100644 --- a/operations/mimir/ruler-remote-evaluation.libsonnet +++ b/operations/mimir/ruler-remote-evaluation.libsonnet @@ -33,12 +33,8 @@ $.querier_args + $.querierUseQuerySchedulerArgs(rulerQuerySchedulerName) + { 'querier.max-concurrent': $._config.ruler_querier_max_concurrency, - } + if !useRulerQueryFrontend then {} else { - // The ruler-querier sends a query response back to the ruler-query-frontend - 'querier.frontend-client.grpc-max-send-msg-size': $._config.ruler_remote_evaluation_max_query_response_size_bytes, }, - ruler_querier_env_map:: $.querier_env_map { // Do not dynamically set GOMAXPROCS for ruler-querier. We don't expect ruler-querier resources // utilization to be spiky, and we want to reduce the risk rule evaluations are getting delayed. @@ -72,8 +68,6 @@ // Result caching is of no benefit to rule evaluation, but the cache can be used for storing cardinality estimates. 'query-frontend.cache-results': false, - // The ruler-query-frontend receives the query response back from the ruler-querier. - 'server.grpc-max-recv-msg-size-bytes': $._config.ruler_remote_evaluation_max_query_response_size_bytes, // The ruler-query-frontend sends the query response back to the ruler. 'server.grpc-max-send-msg-size-bytes': $._config.ruler_remote_evaluation_max_query_response_size_bytes, },