From 8692030f1285053cc4567fd85fe9b08076d424f2 Mon Sep 17 00:00:00 2001 From: Paul Walko Date: Mon, 16 Sep 2019 23:07:53 -0400 Subject: [PATCH] proxy grafana --- fogcutter/docker/monitoring/launch.sh | 4 ++-- fogcutter/docker/nginx/site-confs/seaturtle.pw.enabled | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fogcutter/docker/monitoring/launch.sh b/fogcutter/docker/monitoring/launch.sh index 07f9e07..26167ed 100755 --- a/fogcutter/docker/monitoring/launch.sh +++ b/fogcutter/docker/monitoring/launch.sh @@ -13,16 +13,16 @@ docker run \ --name monitoring_grafana \ --detach \ --restart unless-stopped \ + --env GF_SERVER_DOMAIN="seaturtle.pw" \ + --env GF_SERVER_ROOT_URL="%(protocol)s://%(domain)s/grafana/" \ --user 472 \ --volume $PWD/grafana/grafana-data:/var/lib/grafana:rw \ --volume $PWD/grafana/provisioning:/etc/grafana/provisioning:rw \ - --publish 3000:3000 \ --network pew-monitoring-net \ grafana/grafana:6.3.5 \ && \ docker network connect pew-net monitoring_grafana -# --publish 9090:9090 \ sudo chown nobody:nogroup $PWD/prometheus/prometheus-data \ && \ docker run \ diff --git a/fogcutter/docker/nginx/site-confs/seaturtle.pw.enabled b/fogcutter/docker/nginx/site-confs/seaturtle.pw.enabled index c326db3..225fee0 100644 --- a/fogcutter/docker/nginx/site-confs/seaturtle.pw.enabled +++ b/fogcutter/docker/nginx/site-confs/seaturtle.pw.enabled @@ -32,6 +32,11 @@ server { proxy_pass https://paulwalko.github.io; } + # Proxy grafana + location /grafana/ { + proxy_pass http://monitoring_grafana:3000/; + } + # Proxy syncthing location /syncthing/ { auth_basic "not today buddy";