Skip to content

Commit d4e831b

Browse files
Alerting: Use mimir:r274-1780c50 in CI (grafana#80985)
* Alerting: Use new mimir image in CI * add image to blocks, enable experimental routes
1 parent 2a0f190 commit d4e831b

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

.drone.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -809,9 +809,9 @@ services:
809809
- name: mysql80
810810
path: /var/lib/mysql
811811
- commands:
812-
- /bin/mimir -target=backend
812+
- /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
813813
environment: {}
814-
image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78
814+
image: grafana/mimir:r274-1780c50
815815
name: mimir_backend
816816
- environment: {}
817817
image: redis:6.2.11-alpine
@@ -1256,9 +1256,9 @@ services:
12561256
- name: mysql80
12571257
path: /var/lib/mysql
12581258
- commands:
1259-
- /bin/mimir -target=backend
1259+
- /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
12601260
environment: {}
1261-
image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78
1261+
image: grafana/mimir:r274-1780c50
12621262
name: mimir_backend
12631263
- environment: {}
12641264
image: redis:6.2.11-alpine
@@ -2192,9 +2192,9 @@ services:
21922192
- name: mysql80
21932193
path: /var/lib/mysql
21942194
- commands:
2195-
- /bin/mimir -target=backend
2195+
- /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
21962196
environment: {}
2197-
image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78
2197+
image: grafana/mimir:r274-1780c50
21982198
name: mimir_backend
21992199
- environment: {}
22002200
image: redis:6.2.11-alpine
@@ -3983,9 +3983,9 @@ services:
39833983
- name: mysql80
39843984
path: /var/lib/mysql
39853985
- commands:
3986-
- /bin/mimir -target=backend
3986+
- /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
39873987
environment: {}
3988-
image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78
3988+
image: grafana/mimir:r274-1780c50
39893989
name: mimir_backend
39903990
- environment: {}
39913991
image: redis:6.2.11-alpine
@@ -4501,7 +4501,7 @@ steps:
45014501
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack
45024502
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM python:3.8
45034503
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine
4504-
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78
4504+
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/mimir:r274-1780c50
45054505
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39
45064506
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:8.0.32
45074507
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM redis:6.2.11-alpine
@@ -4535,7 +4535,7 @@ steps:
45354535
- trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack
45364536
- trivy --exit-code 1 --severity HIGH,CRITICAL python:3.8
45374537
- trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine
4538-
- trivy --exit-code 1 --severity HIGH,CRITICAL us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78
4538+
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/mimir:r274-1780c50
45394539
- trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39
45404540
- trivy --exit-code 1 --severity HIGH,CRITICAL mysql:8.0.32
45414541
- trivy --exit-code 1 --severity HIGH,CRITICAL redis:6.2.11-alpine
@@ -4779,6 +4779,6 @@ kind: secret
47794779
name: gcr_credentials
47804780
---
47814781
kind: signature
4782-
hmac: c960d3059e4cb4c852b4b51ce07867d9ea1ab42cb0f30f5775e9889dba71dff3
4782+
hmac: e3ab1ec1c6d9e85f235c0d662808509453e3efa9431da4de420098d1f4e536cc
47834783

47844784
...

devenv/docker/blocks/mimir_backend/docker-compose.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
mimir_backend:
2-
image: grafana/mimir
2+
image: grafana/mimir:r274-1780c50
33
container_name: mimir_backend
44
command:
55
- -target=backend
6+
- -alertmanager.grafana-alertmanager-compatibility-enabled
67
nginx:
78
environment:
89
- NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx

scripts/drone/services/services.star

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def integration_test_services():
5757
"name": "mimir_backend",
5858
"image": images["mimir"],
5959
"environment": {},
60-
"commands": ["/bin/mimir -target=backend"],
60+
"commands": ["/bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled"],
6161
},
6262
{
6363
"name": "redis",

scripts/drone/utils/images.star

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ images = {
2121
"plugins_slack": "plugins/slack",
2222
"python": "python:3.8",
2323
"postgres_alpine": "postgres:12.3-alpine",
24-
"mimir": "us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78",
24+
"mimir": "grafana/mimir:r274-1780c50",
2525
"mysql5": "mysql:5.7.39",
2626
"mysql8": "mysql:8.0.32",
2727
"redis_alpine": "redis:6.2.11-alpine",

0 commit comments

Comments
 (0)