diff --git a/CHANGELOG.md b/CHANGELOG.md index c5366a5861..f8bf9e79c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,8 @@ * [BUGFIX] API: gzip is now enforced when identity encoding is explicitly rejected. #1864 * [BUGFIX] Fix panic at startup when Mimir is running in monolithic mode and query sharding is enabled. #2036 * [BUGFIX] Ruler: report failed evaluation metric for any 5xx status code returned by the query-frontend when remote operational mode is enabled. #2053 +* [BUGFIX] Ingester: fix slow rollout when using `-ingester.ring.unregister-on-shutdown=false` with long `-ingester.ring.heartbeat-period`. #2085 +* [BUGFIX] Ruler: add timeout for remote rule evaluation queries to prevent rule group evaluations getting stuck indefinitely. The duration is configurable with (`-ruler.query-frontend.timeout` (default `2m`). #2090 ### Mixin diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index 63991730ee..16618b533c 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -7404,6 +7404,16 @@ "fieldFlag": "ruler.query-frontend.address", "fieldType": "string" }, + { + "kind": "field", + "name": "timeout", + "required": false, + "desc": "The timeout for a rule query being evaluated by the query-frontend.", + "fieldValue": null, + "fieldDefaultValue": 120000000000, + "fieldFlag": "ruler.query-frontend.timeout", + "fieldType": "duration" + }, { "kind": "block", "name": "grpc_client_config", diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl index c340611d85..1493d5e872 100644 --- a/cmd/mimir/help-all.txt.tmpl +++ b/cmd/mimir/help-all.txt.tmpl @@ -1450,6 +1450,8 @@ Usage of ./cmd/mimir/mimir: Path to the key file for the client certificate. Also requires the client certificate to be configured. -ruler.query-frontend.grpc-client-config.tls-server-name string Override the expected name on the server certificate. + -ruler.query-frontend.timeout duration + The timeout for a rule query being evaluated by the query-frontend. (default 2m0s) -ruler.query-stats-enabled Report the wall time for ruler queries to complete as a per-tenant metric and as an info level log message. -ruler.resend-delay duration diff --git a/cmd/mimir/help.txt.tmpl b/cmd/mimir/help.txt.tmpl index 467b52695f..3669e3e28d 100644 --- a/cmd/mimir/help.txt.tmpl +++ b/cmd/mimir/help.txt.tmpl @@ -450,6 +450,8 @@ Usage of ./cmd/mimir/mimir: Maximum number of rules per rule group per-tenant. 0 to disable. (default 20) -ruler.query-frontend.address string GRPC listen address of the query-frontend(s). Must be a DNS address (prefixed with dns:///) to enable client side load balancing. + -ruler.query-frontend.timeout duration + The timeout for a rule query being evaluated by the query-frontend. (default 2m0s) -ruler.ring.consul.hostname string Hostname and port of Consul. (default "localhost:8500") -ruler.ring.etcd.endpoints value diff --git a/docs/sources/operators-guide/configuring/reference-configuration-parameters/index.md b/docs/sources/operators-guide/configuring/reference-configuration-parameters/index.md index 8b4aca215e..39a0ed7c33 100644 --- a/docs/sources/operators-guide/configuring/reference-configuration-parameters/index.md +++ b/docs/sources/operators-guide/configuring/reference-configuration-parameters/index.md @@ -1400,6 +1400,10 @@ query_frontend: # CLI flag: -ruler.query-frontend.address [address: | default = ""] + # The timeout for a rule query being evaluated by the query-frontend. + # CLI flag: -ruler.query-frontend.timeout + [timeout: | default = 2m] + grpc_client_config: # (advanced) gRPC client max receive message size (bytes). # CLI flag: -ruler.query-frontend.grpc-client-config.grpc-max-recv-msg-size diff --git a/go.mod b/go.mod index c42ed6bd47..443ee59d1e 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,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-20220526081034-789ec0ca4a3b + github.com/grafana/dskit v0.0.0-20220613090928-ebb5c6de233d github.com/grafana/e2e v0.1.1-0.20220519104354-1db01e4751fe github.com/hashicorp/golang-lru v0.5.4 github.com/json-iterator/go v1.1.12 diff --git a/go.sum b/go.sum index 3acdfc5ae5..2043dadf4b 100644 --- a/go.sum +++ b/go.sum @@ -738,8 +738,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/dskit v0.0.0-20211021180445-3bd016e9d7f1/go.mod h1:uPG2nyK4CtgNDmWv7qyzYcdI+S90kHHRWvHnBtEMBXM= github.com/grafana/dskit v0.0.0-20220112093026-95274ccc858d/go.mod h1:M0/dlftwBvH7+hdNNpjMa/CUXD7gsew67mbkCuDlFXE= -github.com/grafana/dskit v0.0.0-20220526081034-789ec0ca4a3b h1:9h79WowXGj6wErMzoi35pBECxnh7ucKJlQTs4Gs0yOI= -github.com/grafana/dskit v0.0.0-20220526081034-789ec0ca4a3b/go.mod h1:9It/K30QPyj/FuTqBb/SYnaS4/BJCP5YL4SRfXB7dG0= +github.com/grafana/dskit v0.0.0-20220613090928-ebb5c6de233d h1:cHmYkgZr5vdkxt7EbzFIwdm9fS/0E3wyTMa1g2vezLg= +github.com/grafana/dskit v0.0.0-20220613090928-ebb5c6de233d/go.mod h1:9It/K30QPyj/FuTqBb/SYnaS4/BJCP5YL4SRfXB7dG0= github.com/grafana/e2e v0.1.1-0.20220519104354-1db01e4751fe h1:mxrRWDjKtob43xF9nEhJthdtCzX35/800Sk7nE//YHQ= github.com/grafana/e2e v0.1.1-0.20220519104354-1db01e4751fe/go.mod h1:+26VJWpczg2OU3D0537acnHSHzhJORpxOs6F+M27tZo= github.com/grafana/memberlist v0.3.1-0.20220425183535-6b97a09b7167 h1:PgEQkGHR4YimSCEGT5IoswN9gJKZDVskf+he6UClCLw= diff --git a/operations/helm/charts/mimir-distributed/Chart.yaml b/operations/helm/charts/mimir-distributed/Chart.yaml index 2c262d75e3..c053243d50 100644 --- a/operations/helm/charts/mimir-distributed/Chart.yaml +++ b/operations/helm/charts/mimir-distributed/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -version: 2.2.0-weekly.189 +version: 2.2.0-weekly.190 appVersion: 2.1.0 description: "Grafana Mimir" engine: gotpl diff --git a/operations/helm/charts/mimir-distributed/README.md b/operations/helm/charts/mimir-distributed/README.md index 9b6ae1c1ae..2dddd53de7 100644 --- a/operations/helm/charts/mimir-distributed/README.md +++ b/operations/helm/charts/mimir-distributed/README.md @@ -4,7 +4,7 @@ Helm chart for deploying [Grafana Mimir](https://grafana.com/docs/mimir/v2.1.x/) # mimir-distributed -![Version: 2.2.0-weekly.189](https://img.shields.io/badge/Version-2.2.0--weekly.189-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square) +![Version: 2.2.0-weekly.190](https://img.shields.io/badge/Version-2.2.0--weekly.190-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square) Grafana Mimir diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml index b3bd7754e5..ce70acc84f 100644 --- a/operations/helm/charts/mimir-distributed/values.yaml +++ b/operations/helm/charts/mimir-distributed/values.yaml @@ -16,7 +16,7 @@ fullnameOverride: null # Since the image is unique for all microservices, so are image settings. image: repository: grafana/mimir - tag: 2.1.0 + tag: r190-fe20bbd pullPolicy: IfNotPresent # Optionally specify an array of imagePullSecrets. # Secrets must be manually created in the namespace. @@ -1429,7 +1429,7 @@ enterprise: # Container image settings for enterprise, note that pullPolicy and pullSecrets are set in top level .image image: repository: grafana/enterprise-metrics - tag: v2.1.0 + tag: r190-9abd21a8 # In order to use Grafana Enterprise Metrics features, you will need to provide the contents of your Grafana Enterprise Metrics # license, either by providing the contents of the license.jwt, or the name Kubernetes Secret that contains your license.jwt. diff --git a/operations/helm/tests/build.sh b/operations/helm/tests/build.sh index b281e96029..08ab5b13c7 100755 --- a/operations/helm/tests/build.sh +++ b/operations/helm/tests/build.sh @@ -19,5 +19,5 @@ for FILEPATH in $TESTS; do TEST_NAME=$(basename -s '.yaml' "$FILEPATH") echo "Templating $TEST_NAME" - helm template "${TEST_NAME}" ${CHART_PATH} -f "${FILEPATH}" --output-dir "operations/helm/tests/${TEST_NAME}-generated" + helm template "${TEST_NAME}" ${CHART_PATH} -f "${FILEPATH}" --output-dir "operations/helm/tests/${TEST_NAME}-generated" --namespace citestns done diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml index 0d793749d0..4742a499a2 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml @@ -16,4 +16,4 @@ roleRef: subjects: - kind: ServiceAccount name: test-enterprise-values-minio-update-prometheus-secret - namespace: "default" + namespace: "citestns" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml index 9c86f09067..d3809bef62 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: "test-enterprise-values-minio" - namespace: "default" + namespace: "citestns" labels: app: minio chart: minio-8.0.10 diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-dep.yaml index 6fc0d5ff1d..93b81f334f 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-dep.yaml @@ -6,7 +6,7 @@ metadata: annotations: {} labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: admin-api @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: admin-api app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -45,7 +45,7 @@ spec: initContainers: containers: - name: admin-api - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=admin-api" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-svc.yaml index dbd9cb9ba9..81103fb108 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-admin-api labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: admin-api diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 3f593bc2be..08debdc65a 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-enterprise-values-mimir-alertmanager labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: alertmanager @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: alertmanager app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -65,7 +65,7 @@ spec: emptyDir: {} containers: - name: alertmanager - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=alertmanager" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml index e5e72b636c..8c1bc40d1c 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-alertmanager-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: alertmanager diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml index 37975bf32b..069b515589 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-alertmanager labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: alertmanager diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml index 55f0cc868f..f54a6ec79a 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-enterprise-values-mimir-compactor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: compactor @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: compactor app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -73,7 +73,7 @@ spec: emptyDir: {} containers: - name: compactor - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=compactor" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml index fe7b12606b..64ab4438cc 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-compactor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: compactor diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml index d81968bc00..f693f34a98 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-enterprise-values-mimir-distributor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: distributor @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: distributor app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: distributor - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=distributor" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml index ad4a9f1cef..b4e322b992 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-distributor-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: distributor diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml index af815ba312..a48639963f 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-distributor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: distributor diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-dep.yaml index a946c6dbcc..6fa3f696c3 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-dep.yaml @@ -6,7 +6,7 @@ metadata: annotations: {} labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: gateway @@ -28,14 +28,14 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: gateway annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -44,7 +44,7 @@ spec: [] containers: - name: gateway - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=gateway" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-svc.yaml index 4d19d71a1a..cbe51233d5 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: gateway diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml index 51af4c76f2..217acc520a 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-gossip-ring labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: gossip-ring diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml index 1bb947a3e7..f830428e40 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml @@ -5,7 +5,7 @@ kind: PodDisruptionBudget metadata: name: test-enterprise-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml index 5e1efc64f6..343d7beb97 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-enterprise-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ingester @@ -28,7 +28,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -36,7 +36,7 @@ spec: app.kubernetes.io/component: ingester app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -64,7 +64,7 @@ spec: emptyDir: {} containers: - name: ingester - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=ingester" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml index f91780d4ac..b5fd673334 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-ingester-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml index 1301971836..5c0e897495 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/license-secret.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/license-secret.yaml index 5846877f9b..341cf16041 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/license-secret.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/license-secret.yaml @@ -5,7 +5,7 @@ kind: Secret metadata: name: test-enterprise-values-mimir-license labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml index 11e3e42d17..b65d539334 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml @@ -4,10 +4,10 @@ apiVersion: batch/v1 kind: Job metadata: name: test-enterprise-values-mimir-distributed-make-bucket-job - namespace: "default" + namespace: "citestns" labels: app: mimir-distributed-make-bucket-job - chart: mimir-distributed-2.2.0-weekly.189 + chart: mimir-distributed-2.2.0-weekly.190 release: test-enterprise-values heritage: Helm spec: diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml index f9c31aa710..8d6bc199d7 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml @@ -6,7 +6,7 @@ metadata: annotations: {} labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: overrides-exporter @@ -28,14 +28,14 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: overrides-exporter annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -44,7 +44,7 @@ spec: [] containers: - name: overrides-exporter - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=overrides-exporter" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml index c27fc7a1cf..dd52c974ea 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-overrides-exporter labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: overrides-exporter diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml index 3964fffda8..0f7c5e5573 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml @@ -5,7 +5,7 @@ kind: PodSecurityPolicy metadata: name: test-enterprise-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-dep.yaml index 237f6aefd0..9c411525d7 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-enterprise-values-mimir-querier labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: querier @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: querier app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: querier - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=querier" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-svc.yaml index ded06cef9e..a18847ce3f 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-querier labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: querier diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml index aa598680f7..f411977596 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-enterprise-values-mimir-query-frontend labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: query-frontend @@ -28,14 +28,14 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: query-frontend annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -44,7 +44,7 @@ spec: [] containers: - name: query-frontend - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=query-frontend" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml index 55290abe0c..929fa34496 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-query-frontend-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: query-frontend diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml index 134e5fa665..14ddca32d4 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-query-frontend labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: query-frontend diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/role.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/role.yaml index 0bfe0d9399..97fa1bf56e 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/role.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/role.yaml @@ -5,7 +5,7 @@ kind: Role metadata: name: test-enterprise-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml index daf73bf5a4..5e41a4791c 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml @@ -5,7 +5,7 @@ kind: RoleBinding metadata: name: test-enterprise-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index b40077a5b2..3c4d148a98 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-enterprise-values-mimir-ruler labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ruler @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: ruler app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: ruler - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=ruler" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml index 95bc0b22dd..0611911fc3 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-ruler labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ruler diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/runtime-configmap.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/runtime-configmap.yaml index 0974615fc3..2bc095421f 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/runtime-configmap.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/runtime-configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: test-enterprise-values-mimir-runtime labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/secret.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/secret.yaml index a10a89ff53..176b9952bd 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/secret.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/secret.yaml @@ -5,10 +5,10 @@ kind: Secret metadata: name: test-enterprise-values-mimir-config labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm data: - mimir.yaml: CgpsaW1pdHM6IHt9CgphY3Rpdml0eV90cmFja2VyOgogIGZpbGVwYXRoOiAvZGF0YS9tZXRyaWNzLWFjdGl2aXR5LmxvZwoKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAnL2RhdGEnCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogJy9hbGVydG1hbmFnZXInCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW5pby5kZWZhdWx0LnN2Yzo5MDAwCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgaW5zZWN1cmU6IHRydWUKCmZyb250ZW5kX3dvcmtlcjoKICBmcm9udGVuZF9hZGRyZXNzOiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXF1ZXJ5LWZyb250ZW5kLWhlYWRsZXNzLmRlZmF1bHQuc3ZjOjkwOTUKCnJ1bGVyOgogIGVuYWJsZV9hcGk6IHRydWUKICBydWxlX3BhdGg6ICcvZGF0YScKICBhbGVydG1hbmFnZXJfdXJsOiBkbnNzcnZub2EraHR0cDovL19odHRwLW1ldHJpY3MuX3RjcC50ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FsL2FsZXJ0bWFuYWdlcgoKc2VydmVyOgogIGdycGNfc2VydmVyX21heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICBncnBjX3NlcnZlcl9tYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgZ3JwY19zZXJ2ZXJfbWF4X2NvbmN1cnJlbnRfc3RyZWFtczogMTAwMAoKZnJvbnRlbmQ6CiAgbG9nX3F1ZXJpZXNfbG9uZ2VyX3RoYW46IDEwcwogIGFsaWduX3F1ZXJpZXNfd2l0aF9zdGVwOiB0cnVlCgpjb21wYWN0b3I6CiAgZGF0YV9kaXI6ICIvZGF0YSIKCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIG51bV90b2tlbnM6IDUxMgogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCgpydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL21pbWlyL3J1bnRpbWUueWFtbAoKbWVtYmVybGlzdDoKICBhYm9ydF9pZl9jbHVzdGVyX2pvaW5fZmFpbHM6IGZhbHNlCiAgY29tcHJlc3Npb25fZW5hYmxlZDogZmFsc2UKICBqb2luX21lbWJlcnM6CiAgLSB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWdvc3NpcC1yaW5nCgojIFRoaXMgY29uZmlndXJlcyBob3cgdGhlIHN0b3JlLWdhdGV3YXkgc3luY2hyb25pemVzIGJsb2NrcyBzdG9yZWQgaW4gdGhlIGJ1Y2tldC4gSXQgdXNlcyBNaW5pbyBieSBkZWZhdWx0IGZvciBnZXR0aW5nIHN0YXJ0ZWQgKGNvbmZpZ3VyZWQgdmlhIGZsYWdzKSBidXQgdGhpcyBzaG91bGQgYmUgY2hhbmdlZCBmb3IgcHJvZHVjdGlvbiBkZXBsb3ltZW50cy4KYmxvY2tzX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICB0c2RiOgogICAgZGlyOiAvZGF0YS90c2RiCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uZGVmYXVsdC5zdmM6OTAwMAogICAgYnVja2V0X25hbWU6IG1pbWlyLXRzZGIKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgaW5zZWN1cmU6IHRydWUKcnVsZXJfc3RvcmFnZToKICBiYWNrZW5kOiBzMwogIHMzOgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uZGVmYXVsdC5zdmM6OTAwMAogICAgYnVja2V0X25hbWU6IG1pbWlyLXJ1bGVyCiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgIGluc2VjdXJlOiB0cnVlCm11bHRpdGVuYW5jeV9lbmFibGVkOiB0cnVlCgphZG1pbl9hcGk6CiAgbGVhZGVyX2VsZWN0aW9uOgogICAgZW5hYmxlZDogdHJ1ZQogICAgcmluZzoKICAgICAga3ZzdG9yZToKICAgICAgICBzdG9yZTogIm1lbWJlcmxpc3QiCmFkbWluX2NsaWVudDoKICBzdG9yYWdlOgogICAgdHlwZTogczMKICAgIHMzOgogICAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW5pby5kZWZhdWx0LnN2Yzo5MDAwCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgICAgaW5zZWN1cmU6IHRydWUKCmF1dGg6CiAgdHlwZTogZW50ZXJwcmlzZQoKY2x1c3Rlcl9uYW1lOiAidGVzdC1lbnRlcnByaXNlLXZhbHVlcyIKCmxpY2Vuc2U6CiAgcGF0aDogIi9saWNlbnNlL2xpY2Vuc2Uuand0IgpnYXRld2F5OgogIHByb3h5OgogICAgZGVmYXVsdDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuZGVmYXVsdC5zdmM6ODA4MAogICAgYWRtaW5fYXBpOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWFkbWluLWFwaS5kZWZhdWx0LnN2Yzo4MDgwCiAgICBhbGVydG1hbmFnZXI6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWxlcnRtYW5hZ2VyLmRlZmF1bHQuc3ZjOjgwODAKICAgIGNvbXBhY3RvcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1jb21wYWN0b3IuZGVmYXVsdC5zdmM6ODA4MAogICAgZGlzdHJpYnV0b3I6CiAgICAgIHVybDogZG5zOi8vL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZGlzdHJpYnV0b3ItaGVhZGxlc3MuZGVmYXVsdC5zdmMuY2x1c3Rlci5sb2NhbDo5MDk1CiAgICBpbmdlc3RlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1pbmdlc3Rlci5kZWZhdWx0LnN2Yzo4MDgwCiAgICBxdWVyeV9mcm9udGVuZDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1mcm9udGVuZC5kZWZhdWx0LnN2Yzo4MDgwCiAgICBydWxlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1ydWxlci5kZWZhdWx0LnN2Yzo4MDgwCiAgICBzdG9yZV9nYXRld2F5OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXN0b3JlLWdhdGV3YXkuZGVmYXVsdC5zdmM6ODA4MAoKaW5zdHJ1bWVudGF0aW9uOgogIGVuYWJsZWQ6IHRydWUKICBkaXN0cmlidXRvcl9jbGllbnQ6CiAgICBhZGRyZXNzOiAnZG5zOi8vL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZGlzdHJpYnV0b3ItaGVhZGxlc3MuZGVmYXVsdC5zdmMuY2x1c3Rlci5sb2NhbDo5MDk1Jwo= + mimir.yaml: CgpsaW1pdHM6IHt9CgphY3Rpdml0eV90cmFja2VyOgogIGZpbGVwYXRoOiAvZGF0YS9tZXRyaWNzLWFjdGl2aXR5LmxvZwoKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAnL2RhdGEnCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogJy9hbGVydG1hbmFnZXInCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW5pby5jaXRlc3Rucy5zdmM6OTAwMAogICAgYnVja2V0X25hbWU6IG1pbWlyLXJ1bGVyCiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgIGluc2VjdXJlOiB0cnVlCgpmcm9udGVuZF93b3JrZXI6CiAgZnJvbnRlbmRfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1mcm9udGVuZC1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6OTA5NQoKcnVsZXI6CiAgZW5hYmxlX2FwaTogdHJ1ZQogIHJ1bGVfcGF0aDogJy9kYXRhJwogIGFsZXJ0bWFuYWdlcl91cmw6IGRuc3Nydm5vYStodHRwOi8vX2h0dHAtbWV0cmljcy5fdGNwLnRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWxlcnRtYW5hZ2VyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsL2FsZXJ0bWFuYWdlcgoKc2VydmVyOgogIGdycGNfc2VydmVyX21heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICBncnBjX3NlcnZlcl9tYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgZ3JwY19zZXJ2ZXJfbWF4X2NvbmN1cnJlbnRfc3RyZWFtczogMTAwMAoKZnJvbnRlbmQ6CiAgbG9nX3F1ZXJpZXNfbG9uZ2VyX3RoYW46IDEwcwogIGFsaWduX3F1ZXJpZXNfd2l0aF9zdGVwOiB0cnVlCgpjb21wYWN0b3I6CiAgZGF0YV9kaXI6ICIvZGF0YSIKCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIG51bV90b2tlbnM6IDUxMgogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCgpydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL21pbWlyL3J1bnRpbWUueWFtbAoKbWVtYmVybGlzdDoKICBhYm9ydF9pZl9jbHVzdGVyX2pvaW5fZmFpbHM6IGZhbHNlCiAgY29tcHJlc3Npb25fZW5hYmxlZDogZmFsc2UKICBqb2luX21lbWJlcnM6CiAgLSB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWdvc3NpcC1yaW5nCgojIFRoaXMgY29uZmlndXJlcyBob3cgdGhlIHN0b3JlLWdhdGV3YXkgc3luY2hyb25pemVzIGJsb2NrcyBzdG9yZWQgaW4gdGhlIGJ1Y2tldC4gSXQgdXNlcyBNaW5pbyBieSBkZWZhdWx0IGZvciBnZXR0aW5nIHN0YXJ0ZWQgKGNvbmZpZ3VyZWQgdmlhIGZsYWdzKSBidXQgdGhpcyBzaG91bGQgYmUgY2hhbmdlZCBmb3IgcHJvZHVjdGlvbiBkZXBsb3ltZW50cy4KYmxvY2tzX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICB0c2RiOgogICAgZGlyOiAvZGF0YS90c2RiCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci10c2RiCiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgIGluc2VjdXJlOiB0cnVlCnJ1bGVyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgaW5zZWN1cmU6IHRydWUKbXVsdGl0ZW5hbmN5X2VuYWJsZWQ6IHRydWUKCmFkbWluX2FwaToKICBsZWFkZXJfZWxlY3Rpb246CiAgICBlbmFibGVkOiB0cnVlCiAgICByaW5nOgogICAgICBrdnN0b3JlOgogICAgICAgIHN0b3JlOiAibWVtYmVybGlzdCIKYWRtaW5fY2xpZW50OgogIHN0b3JhZ2U6CiAgICB0eXBlOiBzMwogICAgczM6CiAgICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgICAgaW5zZWN1cmU6IHRydWUKCmF1dGg6CiAgdHlwZTogZW50ZXJwcmlzZQoKY2x1c3Rlcl9uYW1lOiAidGVzdC1lbnRlcnByaXNlLXZhbHVlcyIKCmxpY2Vuc2U6CiAgcGF0aDogIi9saWNlbnNlL2xpY2Vuc2Uuand0IgpnYXRld2F5OgogIHByb3h5OgogICAgZGVmYXVsdDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFkbWluX2FwaToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXIuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGNvbXBhY3RvcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1jb21wYWN0b3IuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGRpc3RyaWJ1dG9yOgogICAgICB1cmw6IGRuczovLy90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWRpc3RyaWJ1dG9yLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsOjkwOTUKICAgIGluZ2VzdGVyOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWluZ2VzdGVyLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBxdWVyeV9mcm9udGVuZDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1mcm9udGVuZC5jaXRlc3Rucy5zdmM6ODA4MAogICAgcnVsZXI6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItcnVsZXIuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHN0b3JlX2dhdGV3YXk6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItc3RvcmUtZ2F0ZXdheS5jaXRlc3Rucy5zdmM6ODA4MAoKaW5zdHJ1bWVudGF0aW9uOgogIGVuYWJsZWQ6IHRydWUKICBkaXN0cmlidXRvcl9jbGllbnQ6CiAgICBhZGRyZXNzOiAnZG5zOi8vL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZGlzdHJpYnV0b3ItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWw6OTA5NScK diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/serviceaccount.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/serviceaccount.yaml index 78a8ad657b..be6d49b5e3 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/serviceaccount.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: test-enterprise-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml index 485f99bff0..b687d45733 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml @@ -5,7 +5,7 @@ kind: PodDisruptionBudget metadata: name: test-enterprise-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: store-gateway diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml index a6fd00b377..039589abaf 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-enterprise-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: store-gateway @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: store-gateway app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -71,7 +71,7 @@ spec: emptyDir: {} containers: - name: store-gateway - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=store-gateway" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml index 33c3e07dd3..2e5ee3a1ac 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-store-gateway-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: store-gateway diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml index a94d269f9a..2b2ec9cfe8 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: store-gateway diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/tokengen/tokengen-job.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/tokengen/tokengen-job.yaml index 0e2ea38b72..001799580e 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/tokengen/tokengen-job.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/tokengen/tokengen-job.yaml @@ -5,7 +5,7 @@ kind: Job metadata: name: test-enterprise-values-mimir-tokengen labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: tokengen @@ -21,7 +21,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: [] containers: - name: tokengen - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=tokengen" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml index 49d29f0d92..3775aa43d7 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml @@ -16,4 +16,4 @@ roleRef: subjects: - kind: ServiceAccount name: test-oss-values-minio-update-prometheus-secret - namespace: "default" + namespace: "citestns" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml index 117733a9d9..5b1e8bf80f 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: "test-oss-values-minio" - namespace: "default" + namespace: "citestns" labels: app: minio chart: minio-8.0.10 diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index be6b9c174a..d020c3602c 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-oss-values-mimir-alertmanager labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: alertmanager @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: alertmanager app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -62,7 +62,7 @@ spec: emptyDir: {} containers: - name: alertmanager - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=alertmanager" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml index 662fb5387b..498704be57 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-alertmanager-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: alertmanager diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml index 3c6dcb6719..ac014a6f12 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-alertmanager labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: alertmanager diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml index 1205d24e97..84456a93b9 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-oss-values-mimir-compactor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: compactor @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: compactor app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -70,7 +70,7 @@ spec: emptyDir: {} containers: - name: compactor - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=compactor" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml index 2a5af3a6e4..4e80aef5d9 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-compactor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: compactor diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml index d27718199d..dbcb6521cc 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-oss-values-mimir-distributor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: distributor @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: distributor app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: distributor - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=distributor" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml index 2cecc4be2c..10de1223eb 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-distributor-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: distributor diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml index ef0dff05dc..4a0ef61cc0 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-distributor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: distributor diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml index ae66fd7c26..33b698d884 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-gossip-ring labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: gossip-ring diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml index 8772a9d15a..98ebfea55c 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml @@ -5,7 +5,7 @@ kind: PodDisruptionBudget metadata: name: test-oss-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml index 8b9acade53..adfb18ec0e 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-oss-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ingester @@ -28,7 +28,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -36,7 +36,7 @@ spec: app.kubernetes.io/component: ingester app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -61,7 +61,7 @@ spec: emptyDir: {} containers: - name: ingester - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=ingester" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml index bdde7e36d0..f596eb9369 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-ingester-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml index 75966d4195..2910c14054 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml index b714a38d65..1031fc01bf 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml @@ -4,10 +4,10 @@ apiVersion: batch/v1 kind: Job metadata: name: test-oss-values-mimir-distributed-make-bucket-job - namespace: "default" + namespace: "citestns" labels: app: mimir-distributed-make-bucket-job - chart: mimir-distributed-2.2.0-weekly.189 + chart: mimir-distributed-2.2.0-weekly.190 release: test-oss-values heritage: Helm spec: diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index e85527322a..a0a19c1bcd 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: test-oss-values-mimir-nginx labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: nginx @@ -50,52 +50,52 @@ data: # Distributor endpoints location /distributor { - proxy_pass http://test-oss-values-mimir-distributor-headless.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-distributor-headless.citestns.svc.cluster.local:8080$request_uri; } location = /api/v1/push { - proxy_pass http://test-oss-values-mimir-distributor-headless.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-distributor-headless.citestns.svc.cluster.local:8080$request_uri; } # Alertmanager endpoints location /alertmanager { - proxy_pass http://test-oss-values-mimir-alertmanager.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-alertmanager.citestns.svc.cluster.local:8080$request_uri; } location = /multitenant_alertmanager/status { - proxy_pass http://test-oss-values-mimir-alertmanager.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-alertmanager.citestns.svc.cluster.local:8080$request_uri; } location = /api/v1/alerts { - proxy_pass http://test-oss-values-mimir-alertmanager.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-alertmanager.citestns.svc.cluster.local:8080$request_uri; } # Ruler endpoints location /prometheus/config/v1/rules { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } location /prometheus/api/v1/rules { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } location /api/v1/rules { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } location /prometheus/api/v1/alerts { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } location /prometheus/rules { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } location = /ruler/ring { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } # Rest of /prometheus goes to the query frontend location /prometheus { - proxy_pass http://test-oss-values-mimir-query-frontend.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-query-frontend.citestns.svc.cluster.local:8080$request_uri; } # Buildinfo endpoint can go to any component location = /api/v1/status/buildinfo { - proxy_pass http://test-oss-values-mimir-query-frontend.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-query-frontend.citestns.svc.cluster.local:8080$request_uri; } } } diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml index 7ed199b4cb..44dfda2970 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-oss-values-mimir-nginx labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: nginx @@ -25,9 +25,9 @@ spec: template: metadata: annotations: - checksum/config: d7fa3f4c1e841a4634ee7561fa92990e6525d1bfdb176f416744e0b8f72ae99d + checksum/config: 81a467707ff1e0acde06809af678fa262d9ab39cc2e7f33b9ae3292e0299dced labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-svc.yaml index e331454c69..c45a1a61dd 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-nginx labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: nginx diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml index 107d7216c8..688ed4e358 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml @@ -6,7 +6,7 @@ metadata: annotations: {} labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: overrides-exporter @@ -28,14 +28,14 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: overrides-exporter annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -44,7 +44,7 @@ spec: [] containers: - name: overrides-exporter - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=overrides-exporter" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml index 0ff1ee8ec9..ac25c7bd35 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-overrides-exporter labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: overrides-exporter diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml index 395db39947..a6e4070038 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml @@ -5,7 +5,7 @@ kind: PodSecurityPolicy metadata: name: test-oss-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-dep.yaml index f5cd09319e..9be660774f 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-oss-values-mimir-querier labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: querier @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: querier app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: querier - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=querier" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-svc.yaml index c1fcf0582b..b26da30711 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-querier labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: querier diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml index c14cc7b880..de4c904bdc 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-oss-values-mimir-query-frontend labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: query-frontend @@ -28,14 +28,14 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: query-frontend annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -44,7 +44,7 @@ spec: [] containers: - name: query-frontend - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=query-frontend" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml index 7295c71edc..e87ff910f9 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-query-frontend-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: query-frontend diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml index f38983aca6..e120a20fbe 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-query-frontend labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: query-frontend diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/role.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/role.yaml index 744b7b2a51..3e581c33f6 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/role.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/role.yaml @@ -5,7 +5,7 @@ kind: Role metadata: name: test-oss-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/rolebinding.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/rolebinding.yaml index a2310f0d97..9a703de6eb 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/rolebinding.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/rolebinding.yaml @@ -5,7 +5,7 @@ kind: RoleBinding metadata: name: test-oss-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index f7ceb3b049..fff925bf5c 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-oss-values-mimir-ruler labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ruler @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: ruler app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: ruler - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=ruler" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml index ce75a9acec..242ff3cd61 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-ruler labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ruler diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/runtime-configmap.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/runtime-configmap.yaml index 7c5ea9aa67..37e49e5f82 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/runtime-configmap.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/runtime-configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: test-oss-values-mimir-runtime labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/secret.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/secret.yaml index 31de04f6fc..6c0810d91b 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/secret.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/secret.yaml @@ -5,10 +5,10 @@ kind: Secret metadata: name: test-oss-values-mimir-config labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm data: - mimir.yaml: bXVsdGl0ZW5hbmN5X2VuYWJsZWQ6IGZhbHNlCgpsaW1pdHM6IHt9CgphY3Rpdml0eV90cmFja2VyOgogIGZpbGVwYXRoOiAvZGF0YS9tZXRyaWNzLWFjdGl2aXR5LmxvZwoKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAnL2RhdGEnCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogJy9hbGVydG1hbmFnZXInCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1vc3MtdmFsdWVzLW1pbmlvLmRlZmF1bHQuc3ZjOjkwMDAKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci1ydWxlcgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgICBpbnNlY3VyZTogdHJ1ZQoKZnJvbnRlbmRfd29ya2VyOgogIGZyb250ZW5kX2FkZHJlc3M6IHRlc3Qtb3NzLXZhbHVlcy1taW1pci1xdWVyeS1mcm9udGVuZC1oZWFkbGVzcy5kZWZhdWx0LnN2Yzo5MDk1CgpydWxlcjoKICBlbmFibGVfYXBpOiB0cnVlCiAgcnVsZV9wYXRoOiAnL2RhdGEnCiAgYWxlcnRtYW5hZ2VyX3VybDogZG5zc3J2bm9hK2h0dHA6Ly9faHR0cC1tZXRyaWNzLl90Y3AudGVzdC1vc3MtdmFsdWVzLW1pbWlyLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FsL2FsZXJ0bWFuYWdlcgoKc2VydmVyOgogIGdycGNfc2VydmVyX21heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICBncnBjX3NlcnZlcl9tYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgZ3JwY19zZXJ2ZXJfbWF4X2NvbmN1cnJlbnRfc3RyZWFtczogMTAwMAoKZnJvbnRlbmQ6CiAgbG9nX3F1ZXJpZXNfbG9uZ2VyX3RoYW46IDEwcwogIGFsaWduX3F1ZXJpZXNfd2l0aF9zdGVwOiB0cnVlCgpjb21wYWN0b3I6CiAgZGF0YV9kaXI6ICIvZGF0YSIKCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIG51bV90b2tlbnM6IDUxMgogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCgpydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL21pbWlyL3J1bnRpbWUueWFtbAoKbWVtYmVybGlzdDoKICBhYm9ydF9pZl9jbHVzdGVyX2pvaW5fZmFpbHM6IGZhbHNlCiAgY29tcHJlc3Npb25fZW5hYmxlZDogZmFsc2UKICBqb2luX21lbWJlcnM6CiAgLSB0ZXN0LW9zcy12YWx1ZXMtbWltaXItZ29zc2lwLXJpbmcKCiMgVGhpcyBjb25maWd1cmVzIGhvdyB0aGUgc3RvcmUtZ2F0ZXdheSBzeW5jaHJvbml6ZXMgYmxvY2tzIHN0b3JlZCBpbiB0aGUgYnVja2V0LiBJdCB1c2VzIE1pbmlvIGJ5IGRlZmF1bHQgZm9yIGdldHRpbmcgc3RhcnRlZCAoY29uZmlndXJlZCB2aWEgZmxhZ3MpIGJ1dCB0aGlzIHNob3VsZCBiZSBjaGFuZ2VkIGZvciBwcm9kdWN0aW9uIGRlcGxveW1lbnRzLgpibG9ja3Nfc3RvcmFnZToKICBiYWNrZW5kOiBzMwogIHRzZGI6CiAgICBkaXI6IC9kYXRhL3RzZGIKICBidWNrZXRfc3RvcmU6CiAgICBzeW5jX2RpcjogL2RhdGEvdHNkYi1zeW5jCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1vc3MtdmFsdWVzLW1pbmlvLmRlZmF1bHQuc3ZjOjkwMDAKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci10c2RiCiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgIGluc2VjdXJlOiB0cnVlCnJ1bGVyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGVuZHBvaW50OiB0ZXN0LW9zcy12YWx1ZXMtbWluaW8uZGVmYXVsdC5zdmM6OTAwMAogICAgYnVja2V0X25hbWU6IG1pbWlyLXJ1bGVyCiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgIGluc2VjdXJlOiB0cnVlCg== + mimir.yaml: bXVsdGl0ZW5hbmN5X2VuYWJsZWQ6IGZhbHNlCgpsaW1pdHM6IHt9CgphY3Rpdml0eV90cmFja2VyOgogIGZpbGVwYXRoOiAvZGF0YS9tZXRyaWNzLWFjdGl2aXR5LmxvZwoKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAnL2RhdGEnCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogJy9hbGVydG1hbmFnZXInCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1vc3MtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgaW5zZWN1cmU6IHRydWUKCmZyb250ZW5kX3dvcmtlcjoKICBmcm9udGVuZF9hZGRyZXNzOiB0ZXN0LW9zcy12YWx1ZXMtbWltaXItcXVlcnktZnJvbnRlbmQtaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKCnJ1bGVyOgogIGVuYWJsZV9hcGk6IHRydWUKICBydWxlX3BhdGg6ICcvZGF0YScKICBhbGVydG1hbmFnZXJfdXJsOiBkbnNzcnZub2EraHR0cDovL19odHRwLW1ldHJpY3MuX3RjcC50ZXN0LW9zcy12YWx1ZXMtbWltaXItYWxlcnRtYW5hZ2VyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsL2FsZXJ0bWFuYWdlcgoKc2VydmVyOgogIGdycGNfc2VydmVyX21heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICBncnBjX3NlcnZlcl9tYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgZ3JwY19zZXJ2ZXJfbWF4X2NvbmN1cnJlbnRfc3RyZWFtczogMTAwMAoKZnJvbnRlbmQ6CiAgbG9nX3F1ZXJpZXNfbG9uZ2VyX3RoYW46IDEwcwogIGFsaWduX3F1ZXJpZXNfd2l0aF9zdGVwOiB0cnVlCgpjb21wYWN0b3I6CiAgZGF0YV9kaXI6ICIvZGF0YSIKCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIG51bV90b2tlbnM6IDUxMgogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCgpydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL21pbWlyL3J1bnRpbWUueWFtbAoKbWVtYmVybGlzdDoKICBhYm9ydF9pZl9jbHVzdGVyX2pvaW5fZmFpbHM6IGZhbHNlCiAgY29tcHJlc3Npb25fZW5hYmxlZDogZmFsc2UKICBqb2luX21lbWJlcnM6CiAgLSB0ZXN0LW9zcy12YWx1ZXMtbWltaXItZ29zc2lwLXJpbmcKCiMgVGhpcyBjb25maWd1cmVzIGhvdyB0aGUgc3RvcmUtZ2F0ZXdheSBzeW5jaHJvbml6ZXMgYmxvY2tzIHN0b3JlZCBpbiB0aGUgYnVja2V0LiBJdCB1c2VzIE1pbmlvIGJ5IGRlZmF1bHQgZm9yIGdldHRpbmcgc3RhcnRlZCAoY29uZmlndXJlZCB2aWEgZmxhZ3MpIGJ1dCB0aGlzIHNob3VsZCBiZSBjaGFuZ2VkIGZvciBwcm9kdWN0aW9uIGRlcGxveW1lbnRzLgpibG9ja3Nfc3RvcmFnZToKICBiYWNrZW5kOiBzMwogIHRzZGI6CiAgICBkaXI6IC9kYXRhL3RzZGIKICBidWNrZXRfc3RvcmU6CiAgICBzeW5jX2RpcjogL2RhdGEvdHNkYi1zeW5jCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1vc3MtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBidWNrZXRfbmFtZTogbWltaXItdHNkYgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgICBpbnNlY3VyZTogdHJ1ZQpydWxlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1vc3MtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgaW5zZWN1cmU6IHRydWUK diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/serviceaccount.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/serviceaccount.yaml index c5f94d48a9..4e828d2bb7 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/serviceaccount.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: test-oss-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml index 4d990a193d..3044c7a7c6 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml @@ -5,7 +5,7 @@ kind: PodDisruptionBudget metadata: name: test-oss-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: store-gateway diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml index 9f9eca6fde..244f019655 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-oss-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: store-gateway @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: store-gateway app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -68,7 +68,7 @@ spec: emptyDir: {} containers: - name: store-gateway - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=store-gateway" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml index 07f36435a3..3b9829340c 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-store-gateway-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: store-gateway diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml index 288c52639d..92068071eb 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: store-gateway diff --git a/pkg/alertmanager/multitenant_test.go b/pkg/alertmanager/multitenant_test.go index 174ac337df..f6f8169764 100644 --- a/pkg/alertmanager/multitenant_test.go +++ b/pkg/alertmanager/multitenant_test.go @@ -472,6 +472,24 @@ receivers: - api_url: %s bot_token: xxx chat_id: 111 +`, backendURL) + }, + }, + // We expect requests against the HTTP proxy to be blocked too. + "HTTP proxy": { + getAlertmanagerConfig: func(backendURL string) string { + return fmt.Sprintf(` +route: + receiver: webhook + group_wait: 0s + group_interval: 1s + +receivers: + - name: webhook + webhook_configs: + - url: https://www.google.com + http_config: + proxy_url: %s `, backendURL) }, }, diff --git a/pkg/ingester/activeseries/custom_trackers_config.go b/pkg/ingester/activeseries/custom_trackers_config.go index a00821e8d4..3065a44d37 100644 --- a/pkg/ingester/activeseries/custom_trackers_config.go +++ b/pkg/ingester/activeseries/custom_trackers_config.go @@ -133,6 +133,11 @@ func (c *CustomTrackersConfig) UnmarshalYAML(unmarshal func(interface{}) error) return err } +// MarshalYAML implements yaml.Marshaler. +func (c CustomTrackersConfig) MarshalYAML() (interface{}, error) { + return c.source, nil +} + func NewCustomTrackersConfig(m map[string]string) (c CustomTrackersConfig, err error) { c.source = m c.config = map[string]labelsMatchers{} diff --git a/pkg/ingester/activeseries/custom_trackers_config_test.go b/pkg/ingester/activeseries/custom_trackers_config_test.go index 4c91fa5af9..6eb32faa58 100644 --- a/pkg/ingester/activeseries/custom_trackers_config_test.go +++ b/pkg/ingester/activeseries/custom_trackers_config_test.go @@ -205,3 +205,21 @@ func TestTrackersConfigs_Deserialization(t *testing.T) { assert.Error(t, err, "should not deserialize malformed input") }) } + +func TestTrackersConfigs_SerializeDeserialize(t *testing.T) { + sourceYAML := ` + baz: "{baz='bar'}" + foo: "{foo='bar'}" + ` + + obj := mustNewCustomTrackersConfigDeserializedFromYaml(t, sourceYAML) + + t.Run("ShouldSerializeDeserializeResultsTheSame", func(t *testing.T) { + out, err := yaml.Marshal(obj) + require.NoError(t, err, "failed do serialize Custom trackers config") + reSerialized := CustomTrackersConfig{} + err = yaml.Unmarshal(out, &reSerialized) + require.NoError(t, err, "Failed to deserialize serialized object") + assert.Equal(t, obj, reSerialized) + }) +} diff --git a/pkg/mimir/modules.go b/pkg/mimir/modules.go index 32ad4dc6b5..2cca624d7e 100644 --- a/pkg/mimir/modules.go +++ b/pkg/mimir/modules.go @@ -576,7 +576,7 @@ func (t *Mimir) initRuler() (serv services.Service, err error) { if err != nil { return nil, err } - remoteQuerier := ruler.NewRemoteQuerier(queryFrontendClient, t.Cfg.API.PrometheusHTTPPrefix, util_log.Logger, ruler.WithOrgIDMiddleware) + remoteQuerier := ruler.NewRemoteQuerier(queryFrontendClient, t.Cfg.Ruler.QueryFrontend.Timeout, t.Cfg.API.PrometheusHTTPPrefix, util_log.Logger, ruler.WithOrgIDMiddleware) embeddedQueryable = prom_remote.NewSampleAndChunkQueryableClient( remoteQuerier, diff --git a/pkg/ruler/remotequerier.go b/pkg/ruler/remotequerier.go index 419f06a1ae..f8b3a475a9 100644 --- a/pkg/ruler/remotequerier.go +++ b/pkg/ruler/remotequerier.go @@ -54,6 +54,9 @@ type QueryFrontendConfig struct { // Address is the address of the query-frontend to connect to. Address string `yaml:"address"` + // Timeout is the length of time we wait on the query-frontend before giving up. + Timeout time.Duration `yaml:"timeout"` + // GRPCClientConfig contains gRPC specific config options. GRPCClientConfig grpcclient.Config `yaml:"grpc_client_config"` } @@ -65,6 +68,8 @@ func (c *QueryFrontendConfig) RegisterFlags(f *flag.FlagSet) { "GRPC listen address of the query-frontend(s). Must be a DNS address (prefixed with dns:///) "+ "to enable client side load balancing.") + f.DurationVar(&c.Timeout, "ruler.query-frontend.timeout", 2*time.Minute, "The timeout for a rule query being evaluated by the query-frontend.") + c.GRPCClientConfig.RegisterFlagsWithPrefix("ruler.query-frontend.grpc-client-config", f) } @@ -92,6 +97,7 @@ type Middleware func(ctx context.Context, req *httpgrpc.HTTPRequest) error // RemoteQuerier executes read operations against a httpgrpc.HTTPClient. type RemoteQuerier struct { client httpgrpc.HTTPClient + timeout time.Duration middlewares []Middleware promHTTPPrefix string logger log.Logger @@ -100,12 +106,14 @@ type RemoteQuerier struct { // NewRemoteQuerier creates and initializes a new RemoteQuerier instance. func NewRemoteQuerier( client httpgrpc.HTTPClient, + timeout time.Duration, prometheusHTTPPrefix string, logger log.Logger, middlewares ...Middleware, ) *RemoteQuerier { return &RemoteQuerier{ client: client, + timeout: timeout, middlewares: middlewares, promHTTPPrefix: prometheusHTTPPrefix, logger: logger, @@ -147,6 +155,9 @@ func (q *RemoteQuerier) Read(ctx context.Context, query *prompb.Query) (*prompb. } } + ctx, cancel := context.WithTimeout(ctx, q.timeout) + defer cancel() + resp, err := q.client.Handle(ctx, &req) if err != nil { level.Warn(log).Log("msg", "failed to perform remote read", "err", err, "qs", query) @@ -211,6 +222,9 @@ func (q *RemoteQuerier) query(ctx context.Context, query string, ts time.Time, l } } + ctx, cancel := context.WithTimeout(ctx, q.timeout) + defer cancel() + resp, err := q.client.Handle(ctx, &req) if err != nil { level.Warn(logger).Log("msg", "failed to remotely evaluate query expression", "err", err, "qs", query, "tm", ts) diff --git a/pkg/ruler/remotequerier_test.go b/pkg/ruler/remotequerier_test.go index 5f34a8f6d2..9a0f247880 100644 --- a/pkg/ruler/remotequerier_test.go +++ b/pkg/ruler/remotequerier_test.go @@ -44,7 +44,7 @@ func TestRemoteQuerier_ReadReq(t *testing.T) { Body: snappy.Encode(nil, b), }, nil } - q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), "/prometheus", log.NewNopLogger()) + q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), time.Minute, "/prometheus", log.NewNopLogger()) _, err := q.Read(context.Background(), &prompb.Query{}) require.NoError(t, err) @@ -55,6 +55,17 @@ func TestRemoteQuerier_ReadReq(t *testing.T) { require.Equal(t, "/prometheus/api/v1/read", inReq.Url) } +func TestRemoteQuerier_ReadReqTimeout(t *testing.T) { + mockClientFn := func(ctx context.Context, req *httpgrpc.HTTPRequest, _ ...grpc.CallOption) (*httpgrpc.HTTPResponse, error) { + <-ctx.Done() + return nil, ctx.Err() + } + q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), time.Second, "/prometheus", log.NewNopLogger()) + + _, err := q.Read(context.Background(), &prompb.Query{}) + require.Error(t, err) +} + func TestRemoteQuerier_QueryReq(t *testing.T) { var inReq *httpgrpc.HTTPRequest mockClientFn := func(ctx context.Context, req *httpgrpc.HTTPRequest, _ ...grpc.CallOption) (*httpgrpc.HTTPResponse, error) { @@ -63,7 +74,7 @@ func TestRemoteQuerier_QueryReq(t *testing.T) { "status": "success","data": {"resultType":"vector","result":[]} }`)}, nil } - q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), "/prometheus", log.NewNopLogger()) + q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), time.Minute, "/prometheus", log.NewNopLogger()) tm := time.Unix(1649092025, 515834) _, err := q.Query(context.Background(), "qs", tm) @@ -74,3 +85,15 @@ func TestRemoteQuerier_QueryReq(t *testing.T) { require.Equal(t, "query=qs&time="+url.QueryEscape(tm.Format(time.RFC3339Nano)), string(inReq.Body)) require.Equal(t, "/prometheus/api/v1/query", inReq.Url) } + +func TestRemoteQuerier_QueryReqTimeout(t *testing.T) { + mockClientFn := func(ctx context.Context, req *httpgrpc.HTTPRequest, _ ...grpc.CallOption) (*httpgrpc.HTTPResponse, error) { + <-ctx.Done() + return nil, ctx.Err() + } + q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), time.Second, "/prometheus", log.NewNopLogger()) + + tm := time.Unix(1649092025, 515834) + _, err := q.Query(context.Background(), "qs", tm) + require.Error(t, err) +} diff --git a/vendor/github.com/grafana/dskit/modules/module_service.go b/vendor/github.com/grafana/dskit/modules/module_service.go index b27d0244ab..8ca4e25714 100644 --- a/vendor/github.com/grafana/dskit/modules/module_service.go +++ b/vendor/github.com/grafana/dskit/modules/module_service.go @@ -27,6 +27,16 @@ type moduleService struct { startDeps, stopDeps func(string) map[string]services.Service } +type delegatedNamedService struct { + services.Service + + delegate services.NamedService +} + +func (n delegatedNamedService) ServiceName() string { + return n.delegate.ServiceName() +} + // NewModuleService wraps a module service, and makes sure that dependencies are started/stopped before module service starts or stops. // If any dependency fails to start, this service fails as well. // On stop, errors from failed dependencies are ignored. @@ -40,6 +50,14 @@ func NewModuleService(name string, logger log.Logger, service services.Service, } w.Service = services.NewBasicService(w.start, w.run, w.stop) + + if namedService, isNamed := service.(services.NamedService); isNamed { + // return a value that implements services.NamedService only if the wrapped service implements services.NamedService + return delegatedNamedService{ + Service: w, + delegate: namedService, + } + } return w } diff --git a/vendor/github.com/grafana/dskit/ring/lifecycler.go b/vendor/github.com/grafana/dskit/ring/lifecycler.go index da5f603eec..dfef6afb64 100644 --- a/vendor/github.com/grafana/dskit/ring/lifecycler.go +++ b/vendor/github.com/grafana/dskit/ring/lifecycler.go @@ -600,6 +600,10 @@ func (i *Lifecycler) initRing(ctx context.Context) error { instanceDesc.State = ACTIVE } + // We're taking over this entry, update instanceDesc with our values + instanceDesc.Addr = i.Addr + instanceDesc.Zone = i.Zone + // We exist in the ring, so assume the ring is right and copy out tokens & state out of there. i.setState(instanceDesc.State) tokens, _ := ringDesc.TokensFor(i.ID) @@ -607,10 +611,9 @@ func (i *Lifecycler) initRing(ctx context.Context) error { level.Info(i.logger).Log("msg", "existing entry found in ring", "state", i.GetState(), "tokens", len(tokens), "ring", i.RingName) - // Update the ring if the instance has been changed and the heartbeat is disabled. - // We dont need to update KV here when heartbeat is enabled as this info will eventually be update on KV - // on the next heartbeat - if i.cfg.HeartbeatPeriod == 0 && !instanceDesc.Equal(ringDesc.Ingesters[i.ID]) { + // Update the ring if the instance has been changed. We don't want to rely on heartbeat update, as heartbeat + // can be configured to long time, and until then lifecycler would not report this instance as ready in CheckReady. + if !instanceDesc.Equal(ringDesc.Ingesters[i.ID]) { // Update timestamp to give gossiping client a chance register ring change. instanceDesc.Timestamp = time.Now().Unix() ringDesc.Ingesters[i.ID] = instanceDesc diff --git a/vendor/github.com/grafana/dskit/services/service.go b/vendor/github.com/grafana/dskit/services/service.go index c559ef96a3..6170951a10 100644 --- a/vendor/github.com/grafana/dskit/services/service.go +++ b/vendor/github.com/grafana/dskit/services/service.go @@ -100,6 +100,8 @@ type NamedService interface { Service // ServiceName returns name of the service, if it has one. + // Subsequent calls to ServiceName can return different values, + // for example service may update its name based on its state. ServiceName() string } diff --git a/vendor/modules.txt b/vendor/modules.txt index 6449a1e630..df8ee71f6f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -432,7 +432,7 @@ github.com/gosimple/slug # github.com/grafana-tools/sdk v0.0.0-20211220201350-966b3088eec9 => github.com/colega/grafana-tools-sdk v0.0.0-20220323154849-711bca56d13f ## explicit; go 1.13 github.com/grafana-tools/sdk -# github.com/grafana/dskit v0.0.0-20220526081034-789ec0ca4a3b +# github.com/grafana/dskit v0.0.0-20220613090928-ebb5c6de233d ## explicit; go 1.17 github.com/grafana/dskit/backoff github.com/grafana/dskit/concurrency