Francoposa/query scheduler multi dimension queueing 1 backup

CHANGELOG.md

@@ -49,11 +49,13 @@
 * [ENHANCEMENT] Query-frontend: add `instance_enable_ipv6` to support IPv6. #6111
 * [ENHANCEMENT] Store-gateway: return same detailed error messages as queriers when chunks or series limits are reached. #6347
 * [ENHANCEMENT] Querier: reduce memory consumed for queries that hit store-gateways. #6348
-* [ENHANCEMENT] Ruler: include corresponding trace ID with log messages associated with rule evaluation. #6379
+* [ENHANCEMENT] Ruler: include corresponding trace ID with log messages associated with rule evaluation. #6379 #6520
 * [ENHANCEMENT] Querier: clarify log messages and span events emitted while querying ingesters, and include both ingester name and address when relevant. #6381
 * [ENHANCEMENT] Memcached: introduce new experimental configuration parameters `-<prefix>.memcached.write-buffer-size-bytes` `-<prefix>.memcached.read-buffer-size-bytes` to customise the memcached client write and read buffer size (the buffer is allocated for each memcached connection). #6468
 * [ENHANCEMENT] Ingester, Distributor: added experimental support for rejecting push requests received via gRPC before reading them into memory, if ingester or distributor is unable to accept the request. This is activated by using `-ingester.limit-inflight-requests-using-grpc-method-limiter` for ingester, and `-distributor.limit-inflight-requests-using-grpc-method-limiter` for distributor. #5976 #6300
 * [ENHANCEMENT] Query-frontend: return warnings generated during query evaluation. #6391
+* [ENHANCEMENT] Server: Add the option `-server.http-read-header-timeout` to enable specifying a timeout for reading HTTP request headers. It defaults to 0, in which case reading of headers can take up to `-server.http-read-timeout`, leaving no time for reading body, if there's any. #6517
+* [ENHANCEMENT] Add connection-string option, `-<prefix>.azure.connection-string`, for Azure Blob Storage. #6487
 * [BUGFIX] Ring: Ensure network addresses used for component hash rings are formatted correctly when using IPv6. #6068
 * [BUGFIX] Query-scheduler: don't retain connections from queriers that have shut down, leading to gradually increasing enqueue latency over time. #6100 #6145
 * [BUGFIX] Ingester: prevent query logic from continuing to execute after queries are canceled. #6085

Makefile

@@ -212,7 +212,7 @@ mimir-build-image/$(UPTODATE): mimir-build-image/*
 # All the boiler plate for building golang follows:
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER ?= true
-LATEST_BUILD_IMAGE_TAG ?= pr6383-54c7fc6702
+LATEST_BUILD_IMAGE_TAG ?= pr6456-fb5d96e52f
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden

cmd/mimir/config-descriptor.json

@@ -420,13 +420,23 @@
           "kind": "field",
           "name": "http_server_read_timeout",
           "required": false,
-          "desc": "Read timeout for HTTP server",
+          "desc": "Read timeout for entire HTTP request, including headers and body.",
           "fieldValue": null,
           "fieldDefaultValue": 30000000000,
           "fieldFlag": "server.http-read-timeout",
           "fieldType": "duration",
           "fieldCategory": "advanced"
         },
+        {
+          "kind": "field",
+          "name": "http_server_read_header_timeout",
+          "required": false,
+          "desc": "Read timeout for HTTP request headers. If set to 0, value of -server.http-read-timeout is used.",
+          "fieldValue": null,
+          "fieldDefaultValue": 0,
+          "fieldFlag": "server.http-read-header-timeout",
+          "fieldType": "duration"
+        },
         {
           "kind": "field",
           "name": "http_server_write_timeout",
@@ -5807,6 +5817,16 @@
               "fieldFlag": "blocks-storage.azure.account-key",
               "fieldType": "string"
             },
+            {
+              "kind": "field",
+              "name": "connection_string",
+              "required": false,
+              "desc": "If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.",
+              "fieldValue": null,
+              "fieldDefaultValue": "",
+              "fieldFlag": "blocks-storage.azure.connection-string",
+              "fieldType": "string"
+            },
             {
               "kind": "field",
               "name": "container_name",
@@ -11661,6 +11681,16 @@
               "fieldFlag": "ruler-storage.azure.account-key",
               "fieldType": "string"
             },
+            {
+              "kind": "field",
+              "name": "connection_string",
+              "required": false,
+              "desc": "If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.",
+              "fieldValue": null,
+              "fieldDefaultValue": "",
+              "fieldFlag": "ruler-storage.azure.connection-string",
+              "fieldType": "string"
+            },
             {
               "kind": "field",
               "name": "container_name",
@@ -13671,6 +13701,16 @@
               "fieldFlag": "alertmanager-storage.azure.account-key",
               "fieldType": "string"
             },
+            {
+              "kind": "field",
+              "name": "connection_string",
+              "required": false,
+              "desc": "If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.",
+              "fieldValue": null,
+              "fieldDefaultValue": "",
+              "fieldFlag": "alertmanager-storage.azure.connection-string",
+              "fieldType": "string"
+            },
             {
               "kind": "field",
               "name": "container_name",
@@ -15925,6 +15965,16 @@
                   "fieldFlag": "common.storage.azure.account-key",
                   "fieldType": "string"
                 },
+                {
+                  "kind": "field",
+                  "name": "connection_string",
+                  "required": false,
+                  "desc": "If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.",
+                  "fieldValue": null,
+                  "fieldDefaultValue": "",
+                  "fieldFlag": "common.storage.azure.connection-string",
+                  "fieldType": "string"
+                },
                 {
                   "kind": "field",
                   "name": "container_name",

cmd/mimir/help-all.txt.tmpl

@@ -7,6 +7,8 @@ Usage of ./cmd/mimir/mimir:
     	Azure storage account key. If unset, Azure managed identities will be used for authentication instead.
   -alertmanager-storage.azure.account-name string
     	Azure storage account name
+  -alertmanager-storage.azure.connection-string string
+    	If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.
   -alertmanager-storage.azure.container-name string
     	Azure storage container name
   -alertmanager-storage.azure.endpoint-suffix string
@@ -275,6 +277,8 @@ Usage of ./cmd/mimir/mimir:
     	Azure storage account key. If unset, Azure managed identities will be used for authentication instead.
   -blocks-storage.azure.account-name string
     	Azure storage account name
+  -blocks-storage.azure.connection-string string
+    	If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.
   -blocks-storage.azure.container-name string
     	Azure storage container name
   -blocks-storage.azure.endpoint-suffix string
@@ -807,6 +811,8 @@ Usage of ./cmd/mimir/mimir:
     	Azure storage account key. If unset, Azure managed identities will be used for authentication instead.
   -common.storage.azure.account-name string
     	Azure storage account name
+  -common.storage.azure.connection-string string
+    	If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.
   -common.storage.azure.container-name string
     	Azure storage container name
   -common.storage.azure.endpoint-suffix string
@@ -2087,6 +2093,8 @@ Usage of ./cmd/mimir/mimir:
     	Azure storage account key. If unset, Azure managed identities will be used for authentication instead.
   -ruler-storage.azure.account-name string
     	Azure storage account name
+  -ruler-storage.azure.connection-string string
+    	If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.
   -ruler-storage.azure.container-name string
     	Azure storage container name
   -ruler-storage.azure.endpoint-suffix string
@@ -2559,8 +2567,10 @@ Usage of ./cmd/mimir/mimir:
     	HTTP server listen network, default tcp (default "tcp")
   -server.http-listen-port int
     	HTTP server listen port. (default 8080)
+  -server.http-read-header-timeout duration
+    	Read timeout for HTTP request headers. If set to 0, value of -server.http-read-timeout is used.
   -server.http-read-timeout duration
-    	Read timeout for HTTP server (default 30s)
+    	Read timeout for entire HTTP request, including headers and body. (default 30s)
   -server.http-tls-ca-path string
     	HTTP TLS Client CA path.
   -server.http-tls-cert-path string

cmd/mimir/help.txt.tmpl

@@ -5,6 +5,8 @@ Usage of ./cmd/mimir/mimir:
     	Azure storage account key. If unset, Azure managed identities will be used for authentication instead.
   -alertmanager-storage.azure.account-name string
     	Azure storage account name
+  -alertmanager-storage.azure.connection-string string
+    	If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.
   -alertmanager-storage.azure.container-name string
     	Azure storage container name
   -alertmanager-storage.azure.endpoint-suffix string
@@ -111,6 +113,8 @@ Usage of ./cmd/mimir/mimir:
     	Azure storage account key. If unset, Azure managed identities will be used for authentication instead.
   -blocks-storage.azure.account-name string
     	Azure storage account name
+  -blocks-storage.azure.connection-string string
+    	If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.
   -blocks-storage.azure.container-name string
     	Azure storage container name
   -blocks-storage.azure.endpoint-suffix string
@@ -231,6 +235,8 @@ Usage of ./cmd/mimir/mimir:
     	Azure storage account key. If unset, Azure managed identities will be used for authentication instead.
   -common.storage.azure.account-name string
     	Azure storage account name
+  -common.storage.azure.connection-string string
+    	If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.
   -common.storage.azure.container-name string
     	Azure storage container name
   -common.storage.azure.endpoint-suffix string
@@ -531,6 +537,8 @@ Usage of ./cmd/mimir/mimir:
     	Azure storage account key. If unset, Azure managed identities will be used for authentication instead.
   -ruler-storage.azure.account-name string
     	Azure storage account name
+  -ruler-storage.azure.connection-string string
+    	If `connection-string` is set, the value of `endpoint-suffix` will not be used. Use this method over `account-key` if you need to authenticate via a SAS token. Or if you use the Azurite emulator.
   -ruler-storage.azure.container-name string
     	Azure storage container name
   -ruler-storage.azure.endpoint-suffix string
@@ -657,6 +665,8 @@ Usage of ./cmd/mimir/mimir:
     	HTTP server listen address.
   -server.http-listen-port int
     	HTTP server listen port. (default 8080)
+  -server.http-read-header-timeout duration
+    	Read timeout for HTTP request headers. If set to 0, value of -server.http-read-timeout is used.
   -server.log-request-headers
     	Optionally log request headers.
   -server.log-request-headers-exclude-list string

development/mimir-monolithic-mode-with-swift-storage/docker-compose.yml

@@ -43,7 +43,7 @@ services:
   # Scrape the metrics also with the Grafana agent (useful to test metadata ingestion
   # until metadata remote write is not supported by Prometheus).
   grafana-agent:
-    image: grafana/agent:v0.37.1
+    image: grafana/agent:v0.37.3
     command: ["-config.file=/etc/agent-config/grafana-agent.yaml", "-prometheus.wal-directory=/tmp"]
     volumes:
       - ./config:/etc/agent-config

development/mimir-monolithic-mode/docker-compose.yml

@@ -44,7 +44,7 @@ services:
   grafana-agent:
     profiles:
       - grafana-agent-static
-    image: grafana/agent:v0.37.2
+    image: grafana/agent:v0.37.3
     command: ["-config.file=/etc/agent-config/grafana-agent.yaml", "-prometheus.wal-directory=/tmp"]
     volumes:
       - ./config:/etc/agent-config
@@ -54,7 +54,7 @@ services:
   grafana-agent-flow:
     profiles:
       - grafana-agent-flow
-    image: grafana/agent:v0.37.2
+    image: grafana/agent:v0.37.3
     environment:
       - AGENT_MODE=flow
     command: ["run", "--server.http.listen-addr=0.0.0.0:9092", "/etc/agent/config.river"]

docs/sources/mimir/references/configuration-parameters/index.md

@@ -590,10 +590,15 @@ grpc_tls_config:
 # CLI flag: -server.graceful-shutdown-timeout
 [graceful_shutdown_timeout: <duration> | default = 30s]
 
-# (advanced) Read timeout for HTTP server
+# (advanced) Read timeout for entire HTTP request, including headers and body.
 # CLI flag: -server.http-read-timeout
 [http_server_read_timeout: <duration> | default = 30s]
 
+# Read timeout for HTTP request headers. If set to 0, value of
+# -server.http-read-timeout is used.
+# CLI flag: -server.http-read-header-timeout
+[http_server_read_header_timeout: <duration> | default = 0s]
+
 # (advanced) Write timeout for HTTP server
 # CLI flag: -server.http-write-timeout
 [http_server_write_timeout: <duration> | default = 2m]
@@ -4601,6 +4606,12 @@ The `azure_storage_backend` block configures the connection to Azure object stor
 # CLI flag: -<prefix>.azure.account-key
 [account_key: <string> | default = ""]
 
+# If `connection-string` is set, the value of `endpoint-suffix` will not be
+# used. Use this method over `account-key` if you need to authenticate via a SAS
+# token. Or if you use the Azurite emulator.
+# CLI flag: -<prefix>.azure.connection-string
+[connection_string: <string> | default = ""]
+
 # Azure storage container name
 # CLI flag: -<prefix>.azure.container-name
 [container_name: <string> | default = ""]

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/golang/snappy v0.0.4
 	github.com/google/gopacket v1.1.19
 	github.com/gorilla/mux v1.8.0
-	github.com/grafana/dskit v0.0.0-20231030022856-30221e73f47e
+	github.com/grafana/dskit v0.0.0-20231031132813-52f4e8d82d59
 	github.com/grafana/e2e v0.1.1
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/json-iterator/go v1.1.12
@@ -249,7 +249,7 @@ require (
 )
 
 // Using a fork of Prometheus with Mimir-specific changes.
-replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20231027081731-c0ddc1f2ec07
+replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20231101140207-5f9db04c2d53
 
 // Replace memberlist with our fork which includes some fixes that haven't been
 // merged upstream yet:

go.sum

@@ -538,8 +538,8 @@ github.com/gosimple/slug v1.1.1 h1:fRu/digW+NMwBIP+RmviTK97Ho/bEj/C9swrCspN3D4=
 github.com/gosimple/slug v1.1.1/go.mod h1:ER78kgg1Mv0NQGlXiDe57DpCyfbNywXXZ9mIorhxAf0=
 github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85Tnn+WEvr8fDpfwibmEPgfgFEaC87G24=
 github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
-github.com/grafana/dskit v0.0.0-20231030022856-30221e73f47e h1:78Seyn40QzROIdIyVhbOzaEn1xGl3DC+37zh+ZLOUAo=
-github.com/grafana/dskit v0.0.0-20231030022856-30221e73f47e/go.mod h1:8dsy5tQOkeNQyjXpm5mQsbCu3H5uzeBD35MzRQFznKU=
+github.com/grafana/dskit v0.0.0-20231031132813-52f4e8d82d59 h1:tWbF2UD8HgvpqyxV60zmUDDzJI2gybMJxw4/RY/UNTo=
+github.com/grafana/dskit v0.0.0-20231031132813-52f4e8d82d59/go.mod h1:8dsy5tQOkeNQyjXpm5mQsbCu3H5uzeBD35MzRQFznKU=
 github.com/grafana/e2e v0.1.1 h1:/b6xcv5BtoBnx8cZnCiey9DbjEc8z7gXHO5edoeRYxc=
 github.com/grafana/e2e v0.1.1/go.mod h1:RpNLgae5VT+BUHvPE+/zSypmOXKwEu4t+tnEMS1ATaE=
 github.com/grafana/goautoneg v0.0.0-20231010094147-47ce5e72a9ae h1:Yxbw9jKGJVC6qAK5Ubzzb/qZwM6rRMMqaDc/d4Vp3pM=
@@ -548,8 +548,8 @@ github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586 h1:/of8Z8taCPft
 github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586/go.mod h1:PGk3RjYHpxMM8HFPhKKo+vve3DdlPUELZLSDEFehPuU=
 github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe h1:yIXAAbLswn7VNWBIvM71O2QsgfgW9fRXZNR0DXe6pDU=
 github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/grafana/mimir-prometheus v0.0.0-20231027081731-c0ddc1f2ec07 h1:7/7VR+ixN8O1VlxrIokJnc9OgjeSfBI9KbvhjP0ehV0=
-github.com/grafana/mimir-prometheus v0.0.0-20231027081731-c0ddc1f2ec07/go.mod h1:AEcvuS2UD6tkY+LgW6TTcLQI7urG/vuyBb+tVO8EiMI=
+github.com/grafana/mimir-prometheus v0.0.0-20231101140207-5f9db04c2d53 h1:Iw362e4PrqFmtbXiZlUZCX6j/x6m3iJsLmfkyd3vrY4=
+github.com/grafana/mimir-prometheus v0.0.0-20231101140207-5f9db04c2d53/go.mod h1:AEcvuS2UD6tkY+LgW6TTcLQI7urG/vuyBb+tVO8EiMI=
 github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956 h1:em1oddjXL8c1tL0iFdtVtPloq2hRPen2MJQKoAWpxu0=
 github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
 github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 h1:A3dhViTeFDSQcGOXuUi6ukCQSMyDtDISBp2z6OOo2YM=

mimir-build-image/Dockerfile

@@ -3,7 +3,7 @@
 # Provenance-includes-license: Apache-2.0
 # Provenance-includes-copyright: The Cortex Authors.
 
-FROM registry.k8s.io/kustomize/kustomize:v5.1.1 as kustomize
+FROM registry.k8s.io/kustomize/kustomize:v5.2.1 as kustomize
 FROM alpine/helm:3.13.1 as helm
 FROM golang:1.21.3-bullseye
 ARG goproxyValue

operations/helm/charts/mimir-distributed/Chart.lock

@@ -4,9 +4,9 @@ dependencies:
   version: 5.0.14
 - name: grafana-agent-operator
   repository: https://grafana.github.io/helm-charts
-  version: 0.3.7
+  version: 0.3.8
 - name: rollout-operator
   repository: https://grafana.github.io/helm-charts
   version: 0.9.1
-digest: sha256:a33f94d698d6fd2cd703c0f7482ad6d03f4cb44e4971272bb9fa1703e9f10a12
-generated: "2023-10-16T00:58:44.873531463Z"
+digest: sha256:8a4b2f3d0e30bc7a5aedf99f0a26da61a267a8b0d143eb85f45485bc02cad58d
+generated: "2023-10-23T03:41:31.534206747Z"

operations/helm/charts/mimir-distributed/Chart.yaml

@@ -14,7 +14,7 @@ dependencies:
     condition: minio.enabled
   - name: grafana-agent-operator
     alias: grafana-agent-operator
-    version: 0.3.7
+    version: 0.3.8
     repository: https://grafana.github.io/helm-charts
     condition: metaMonitoring.grafanaAgent.installOperator
   - name: rollout-operator

operations/helm/charts/mimir-distributed/README.md

@@ -25,7 +25,7 @@ Kubernetes: `^1.20.0-0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://charts.min.io/ | minio(minio) | 5.0.14 |
-| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.3.7 |
+| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.3.8 |
 | https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.9.1 |
 
 # Contributing and releasing

operations/helm/charts/mimir-distributed/values.yaml

@@ -1659,7 +1659,7 @@ memcached:
     # -- Memcached Docker image repository
     repository: memcached
     # -- Memcached Docker image tag
-    tag: 1.6.21-alpine
+    tag: 1.6.22-alpine
     # -- Memcached Docker image pull policy
     pullPolicy: IfNotPresent