From d040df953fdef264a6e5ea1436df9dae83732ebd Mon Sep 17 00:00:00 2001 From: lance Date: Fri, 7 Feb 2020 12:48:30 -0800 Subject: [PATCH] fix dashboard, set ports to bind to loopback, adjust env vars for grafana --- Docker/docker-compose.deploy.yaml | 8 +++++--- Docker/files/grafana/xmrauctions_metrics.json | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Docker/docker-compose.deploy.yaml b/Docker/docker-compose.deploy.yaml index a09cc7c..8894b71 100644 --- a/Docker/docker-compose.deploy.yaml +++ b/Docker/docker-compose.deploy.yaml @@ -19,11 +19,13 @@ services: grafana: image: grafana/grafana:6.5.0 ports: - - 3000:3000 + - 127.0.0.1:3000:3000 environment: GF_SECURITY_ADMIN_USER: admin - HOSTNAME: grafana GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_PASSWORD} + GF_SERVER_ROOT_URL: ${GRAFANA_URL} + GF_SERVER_SERVE_FROM_SUB_PATH: "true" + GF_SERVER_ENFORCE_DOMAIN: "true" GF_ANALYTICS_REPORTING_ENABLED: "false" GF_ANALYTICS_CHECK_FOR_UPDATES: "false" volumes: @@ -34,7 +36,7 @@ services: prometheus: image: prom/prometheus:v2.15.2 ports: - - 9090:9090 + - 127.0.0.1:9090:9090 volumes: - ./Docker/files/prometheus:/etc/prometheus - prometheus:/prometheus diff --git a/Docker/files/grafana/xmrauctions_metrics.json b/Docker/files/grafana/xmrauctions_metrics.json index 24b878a..a07c1ab 100644 --- a/Docker/files/grafana/xmrauctions_metrics.json +++ b/Docker/files/grafana/xmrauctions_metrics.json @@ -1,4 +1,4 @@ -{ +{ "annotations": { "list": [ {