From 20e624dafd91a8b22ca7a9916045e36b3fda20ec Mon Sep 17 00:00:00 2001 From: Santiago Date: Fri, 13 Oct 2023 16:15:05 +0100 Subject: [PATCH] Alerting: Add Mimir Backend image to devenv (blocks) (#76416) --- .github/CODEOWNERS | 1 + .../blocks/mimir_backend/docker-compose.yaml | 16 ++++++++++++++++ .../blocks/mimir_backend/nginx/.htpasswd | 2 ++ .../mimir_backend/nginx/nginx.conf.template | 18 ++++++++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 devenv/docker/blocks/mimir_backend/docker-compose.yaml create mode 100644 devenv/docker/blocks/mimir_backend/nginx/.htpasswd create mode 100644 devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5e3e73f2891..b7e4f1e67d1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -187,6 +187,7 @@ /devenv/docker/blocks/maildev/ @grafana/alerting-frontend /devenv/docker/blocks/mariadb/ @grafana/grafana-bi-squad /devenv/docker/blocks/memcached/ @grafana/backend-platform +/devenv/docker/blocks/mimir_backend/ @grafana/alerting-backend-product /devenv/docker/blocks/mssql/ @grafana/grafana-bi-squad /devenv/docker/blocks/mssql_arm64/ @grafana/grafana-bi-squad /devenv/docker/blocks/mssql_tests/ @grafana/grafana-bi-squad diff --git a/devenv/docker/blocks/mimir_backend/docker-compose.yaml b/devenv/docker/blocks/mimir_backend/docker-compose.yaml new file mode 100644 index 00000000000..8666ab093cc --- /dev/null +++ b/devenv/docker/blocks/mimir_backend/docker-compose.yaml @@ -0,0 +1,16 @@ + mimir_backend: + image: grafana/mimir + container_name: mimir_backend + command: + - -target=backend + nginx: + environment: + - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx + - MIMIR_BACKEND_URL=mimir_backend:8080 + hostname: nginx + image: nginxinc/nginx-unprivileged:1.22-alpine + ports: + - 8080:8080 + volumes: + - "./docker/blocks/mimir_backend/nginx/nginx.conf.template:/etc/nginx/templates/nginx.conf.template" + - "./docker/blocks/mimir_backend/nginx/.htpasswd:/etc/nginx/.htpasswd" \ No newline at end of file diff --git a/devenv/docker/blocks/mimir_backend/nginx/.htpasswd b/devenv/docker/blocks/mimir_backend/nginx/.htpasswd new file mode 100644 index 00000000000..f2af629df1a --- /dev/null +++ b/devenv/docker/blocks/mimir_backend/nginx/.htpasswd @@ -0,0 +1,2 @@ +// test:test +test:$apr1$fzP1qWUA$gGOojmRicBlNiSdiSGjwv1 diff --git a/devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template b/devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template new file mode 100644 index 00000000000..ba112545643 --- /dev/null +++ b/devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template @@ -0,0 +1,18 @@ +pid /tmp/nginx.pid; + +events {} + +http { + resolver 127.0.0.11 ipv6=off; + + server { + listen 8080; + proxy_set_header X-Scope-OrgID $http_x_scope_orgid; + + location / { + auth_basic "Mimir Backend"; + auth_basic_user_file /etc/nginx/.htpasswd; + proxy_pass http://${MIMIR_BACKEND_URL}; + } + } +} \ No newline at end of file