public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alerting: Use mimir:r274-1780c50 in CI (#80985)

Browse Source 
* Alerting: Use new mimir image in CI

* add image to blocks, enable experimental routes
This commit is contained in:
Santiago
2024-01-22 16:25:50 +02:00
committed by GitHub
parent 2a0f1900d5
commit d4e831b051
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+11 -11
View File
@@ -809,9 +809,9 @@ services:
- name: mysql80 - name: mysql80
path: /var/lib/mysql path: /var/lib/mysql
- commands: - commands:
- /bin/mimir -target=backend - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
environment: {} environment: {}
image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78 image: grafana/mimir:r274-1780c50
name: mimir_backend name: mimir_backend
- environment: {} - environment: {}
image: redis:6.2.11-alpine image: redis:6.2.11-alpine
@@ -1256,9 +1256,9 @@ services:
- name: mysql80 - name: mysql80
path: /var/lib/mysql path: /var/lib/mysql
- commands: - commands:
- /bin/mimir -target=backend - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
environment: {} environment: {}
image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78 image: grafana/mimir:r274-1780c50
name: mimir_backend name: mimir_backend
- environment: {} - environment: {}
image: redis:6.2.11-alpine image: redis:6.2.11-alpine
@@ -2192,9 +2192,9 @@ services:
- name: mysql80 - name: mysql80
path: /var/lib/mysql path: /var/lib/mysql
- commands: - commands:
- /bin/mimir -target=backend - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
environment: {} environment: {}
image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78 image: grafana/mimir:r274-1780c50
name: mimir_backend name: mimir_backend
- environment: {} - environment: {}
image: redis:6.2.11-alpine image: redis:6.2.11-alpine
@@ -3983,9 +3983,9 @@ services:
- name: mysql80 - name: mysql80
path: /var/lib/mysql path: /var/lib/mysql
- commands: - commands:
- /bin/mimir -target=backend - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
environment: {} environment: {}
image: us.gcr.io/kubernetes-dev/mimir:gotjosh-state-config-grafana-663a0ae78 image: grafana/mimir:r274-1780c50
name: mimir_backend name: mimir_backend
- environment: {} - environment: {}
image: redis:6.2.11-alpine 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 plugins/slack
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM python:3.8 - 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 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:5.7.39
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:8.0.32 - 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 - 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 plugins/slack
- trivy --exit-code 1 --severity HIGH,CRITICAL python:3.8 - 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 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:5.7.39
- trivy --exit-code 1 --severity HIGH,CRITICAL mysql:8.0.32 - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:8.0.32
- trivy --exit-code 1 --severity HIGH,CRITICAL redis:6.2.11-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL redis:6.2.11-alpine
@@ -4779,6 +4779,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: c960d3059e4cb4c852b4b51ce07867d9ea1ab42cb0f30f5775e9889dba71dff3 hmac: e3ab1ec1c6d9e85f235c0d662808509453e3efa9431da4de420098d1f4e536cc
... ...
devenv/docker/blocks/mimir_backend/docker-compose.yaml
+2 -1
View File
@@ -1,8 +1,9 @@
mimir_backend: mimir_backend:
image: grafana/mimir image: grafana/mimir:r274-1780c50
container_name: mimir_backend container_name: mimir_backend
command: command:
- -target=backend - -target=backend
- -alertmanager.grafana-alertmanager-compatibility-enabled
nginx: nginx:
environment: environment:
- NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
scripts/drone/services/services.star
+1 -1
View File
@@ -57,7 +57,7 @@ def integration_test_services():
"name": "mimir_backend", "name": "mimir_backend",
"image": images["mimir"], "image": images["mimir"],
"environment": {}, "environment": {},
"commands": ["/bin/mimir -target=backend"], "commands": ["/bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled"],
}, },
{ {
"name": "redis", "name": "redis",
scripts/drone/utils/images.star
+1 -1
View File
@@ -21,7 +21,7 @@ images = {
"plugins_slack": "plugins/slack", "plugins_slack": "plugins/slack",
"python": "python:3.8", "python": "python:3.8",
"postgres_alpine": "postgres:12.3-alpine", "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", "mysql5": "mysql:5.7.39",
"mysql8": "mysql:8.0.32", "mysql8": "mysql:8.0.32",
"redis_alpine": "redis:6.2.11-alpine", "redis_alpine": "redis:6.2.11-alpine",