Skip to content
Merged

dev #24

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 10 additions & 0 deletions nginx/default.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
upstream backend {
server web:8000;
}
upstream grafana {
server grafana:3000;
}

server {
listen 80;
Expand Down Expand Up @@ -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;
}
Expand Down