From c952ca547abfb9e1f1758a000b55c0e0a2043504 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 6 Feb 2026 10:23:25 -0700 Subject: [PATCH] simplify grafana vars --- lxc1/p4-monitor/grafana.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lxc1/p4-monitor/grafana.yml b/lxc1/p4-monitor/grafana.yml index 936e342..c60e111 100644 --- a/lxc1/p4-monitor/grafana.yml +++ b/lxc1/p4-monitor/grafana.yml @@ -1,13 +1,13 @@ services: grafana: image: grafana/grafana-oss:latest - container_name: grafana_node${GRAFANA_NODE_ID} + container_name: grafana_node${GF_NODE_ID} user: "1000:1000" restart: always environment: - - GF_SERVER_ROOT_URL=https://${GRAFANA_HOST_NAME}.${TRAEFIK_DNS_SUFFIX} - - GF_SECURITY_ADMIN_USER=${GRAFANA_USER_NAME} - - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_USER_PASS} + - GF_SERVER_ROOT_URL=https://${GF_HOST_NAME}.${TRAEFIK_DNS_SUFFIX} + - GF_SECURITY_ADMIN_USER=${GF_USER_NAME} + - GF_SECURITY_ADMIN_PASSWORD=${GF_USER_PASS} - GF_USERS_ALLOW_SIGN_UP=false volumes: - /shared/grafana/data:/var/lib/grafana @@ -19,7 +19,7 @@ services: labels: - "traefik.enable=true" - "traefik.docker.network=grafana_external" - - "traefik.http.routers.grafana.rule=Host(`${GRAFANA_HOST_NAME}.${TRAEFIK_DNS_SUFFIX}`)" + - "traefik.http.routers.grafana.rule=Host(`${GF_HOST_NAME}.${TRAEFIK_DNS_SUFFIX}`)" - "traefik.http.routers.grafana.entrypoints=websecure" - "traefik.http.routers.grafana.tls=true" - "traefik.http.routers.grafana.tls.certresolver=dns_resolver"