From d4e831b0517bfc2eee8780ff716b72d7e1a1cb95 Mon Sep 17 00:00:00 2001 From: Santiago Date: Mon, 22 Jan 2024 15:25:50 +0100 Subject: [PATCH] Alerting: Use mimir:r274-1780c50 in CI (#80985) * Alerting: Use new mimir image in CI * add image to blocks, enable experimental routes --- .drone.yml | 22 +++++++++---------- .../blocks/mimir_backend/docker-compose.yaml | 3 ++- scripts/drone/services/services.star | 2 +- scripts/drone/utils/images.star | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 83f05a49d3a..b640eb840d8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -809,9 +809,9 @@ services: - name: mysql80 path: /var/lib/mysql - commands: - - /bin/mimir -target=backend + - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled environment: {} - image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78 + image: grafana/mimir:r274-1780c50 name: mimir_backend - environment: {} image: redis:6.2.11-alpine @@ -1256,9 +1256,9 @@ services: - name: mysql80 path: /var/lib/mysql - commands: - - /bin/mimir -target=backend + - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled environment: {} - image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78 + image: grafana/mimir:r274-1780c50 name: mimir_backend - environment: {} image: redis:6.2.11-alpine @@ -2192,9 +2192,9 @@ services: - name: mysql80 path: /var/lib/mysql - commands: - - /bin/mimir -target=backend + - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled environment: {} - image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78 + image: grafana/mimir:r274-1780c50 name: mimir_backend - environment: {} image: redis:6.2.11-alpine @@ -3983,9 +3983,9 @@ services: - name: mysql80 path: /var/lib/mysql - commands: - - /bin/mimir -target=backend + - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled environment: {} - image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78 + image: grafana/mimir:r274-1780c50 name: mimir_backend - environment: {} image: redis:6.2.11-alpine @@ -4501,7 +4501,7 @@ steps: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM python:3.8 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78 + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/mimir:r274-1780c50 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:8.0.32 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM redis:6.2.11-alpine @@ -4535,7 +4535,7 @@ steps: - trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack - trivy --exit-code 1 --severity HIGH,CRITICAL python:3.8 - trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine - - trivy --exit-code 1 --severity HIGH,CRITICAL us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78 + - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/mimir:r274-1780c50 - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39 - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:8.0.32 - trivy --exit-code 1 --severity HIGH,CRITICAL redis:6.2.11-alpine @@ -4779,6 +4779,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: c960d3059e4cb4c852b4b51ce07867d9ea1ab42cb0f30f5775e9889dba71dff3 +hmac: e3ab1ec1c6d9e85f235c0d662808509453e3efa9431da4de420098d1f4e536cc ... diff --git a/devenv/docker/blocks/mimir_backend/docker-compose.yaml b/devenv/docker/blocks/mimir_backend/docker-compose.yaml index 8666ab093cc..058a0d86085 100644 --- a/devenv/docker/blocks/mimir_backend/docker-compose.yaml +++ b/devenv/docker/blocks/mimir_backend/docker-compose.yaml @@ -1,8 +1,9 @@ mimir_backend: - image: grafana/mimir + image: grafana/mimir:r274-1780c50 container_name: mimir_backend command: - -target=backend + - -alertmanager.grafana-alertmanager-compatibility-enabled nginx: environment: - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx diff --git a/scripts/drone/services/services.star b/scripts/drone/services/services.star index 911aacfb000..6d3044e932a 100644 --- a/scripts/drone/services/services.star +++ b/scripts/drone/services/services.star @@ -57,7 +57,7 @@ def integration_test_services(): "name": "mimir_backend", "image": images["mimir"], "environment": {}, - "commands": ["/bin/mimir -target=backend"], + "commands": ["/bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled"], }, { "name": "redis", diff --git a/scripts/drone/utils/images.star b/scripts/drone/utils/images.star index e2b672963d5..92162ffbfa4 100644 --- a/scripts/drone/utils/images.star +++ b/scripts/drone/utils/images.star @@ -21,7 +21,7 @@ images = { "plugins_slack": "plugins/slack", "python": "python:3.8", "postgres_alpine": "postgres:12.3-alpine", - "mimir": "us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78", + "mimir": "grafana/mimir:r274-1780c50", "mysql5": "mysql:5.7.39", "mysql8": "mysql:8.0.32", "redis_alpine": "redis:6.2.11-alpine",