IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Devenv: Fix Prometheus basic auth proxy (#28889)

Browse Source 
* prometheus basic auth proxy: Pin base image version

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* prometheus basic auth proxy: Don't use host network mode

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* prometheus basic auth proxy: Enable logging

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* prometheus basic auth proxy: Fix Dockerfile location

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-11-06 14:56:02 +01:00 committed by GitHub
parent 2c246276fd
commit 3e60b41883
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devenv/docker/blocks/prometheus_basic_auth_proxy/Dockerfile
View File

@ -1,4 +1,4 @@
FROM nginx:alpine
FROM nginx:1.19.3-alpine
COPY nginx.conf /etc/nginx/nginx.conf
COPY htpasswd /etc/nginx/htpasswd

5
devenv/docker/blocks/prometheus_basic_auth_proxy/docker-compose.yaml
View File

@ -2,5 +2,6 @@
# http://prometheus:9090 (Prometheus inside the docker compose)
nginxproxy:
build: docker/blocks/nginx_proxy
network_mode: host
build: docker/blocks/prometheus_basic_auth_proxy
ports:
- "10090:10090"

1
devenv/docker/blocks/prometheus_basic_auth_proxy/nginx.conf
View File

@ -2,6 +2,7 @@ events { }
http {
server {
error_log stderr info;
listen 10090;