diff --git a/docker-compose.yml b/docker-compose.yml index 6e8d165..e26655d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,16 +51,15 @@ services: prometheus: image: prom/prometheus - ports: - - "9090:9090" volumes: - ./prometheus.yml:/etc/prometheus/prometheus.yml - prometheus_data:/prometheus grafana: image: grafana/grafana - ports: - - "3000:3000" + environment: + GF_SERVER_ROOT_URL: "https://bdnsrvepic.duckdns.org/grafana/" + GF_SERVER_SERVE_FROM_SUB_PATH: true volumes: - grafana_data:/var/lib/grafana diff --git a/nginx/default.conf b/nginx/default.conf index af0c566..4ffdadb 100644 --- a/nginx/default.conf +++ b/nginx/default.conf @@ -1,6 +1,9 @@ upstream backend { server web:8000; } +upstream grafana { + server grafana:3000; +} server { listen 80; @@ -28,6 +31,13 @@ server{ proxy_pass http://backend; } + location /grafana/{ + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://grafana; + } + location = /metrics { return 404; }