From 35d29a40152dd3b2693d51721b0f5b939534feab Mon Sep 17 00:00:00 2001
From: "tom.chivert" <tom.chivert@alterway.fr>
Date: Tue, 19 Mar 2024 17:38:32 +0100
Subject: [PATCH] minor fixes

---
 files/dashboards/node-exporter.json         | 2 +-
 templates/compose/grafana-prometheus.yml.j2 | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/files/dashboards/node-exporter.json b/files/dashboards/node-exporter.json
index 7d01909..6a21a3d 100644
--- a/files/dashboards/node-exporter.json
+++ b/files/dashboards/node-exporter.json
@@ -23833,7 +23833,7 @@
   },
   "timezone": "browser",
   "title": "Node Exporter",
-  "uid": "yPhvsDP7k",
+  "uid": "rYdddlPWk",
   "version": 1,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/templates/compose/grafana-prometheus.yml.j2 b/templates/compose/grafana-prometheus.yml.j2
index 39106bb..af650fe 100644
--- a/templates/compose/grafana-prometheus.yml.j2
+++ b/templates/compose/grafana-prometheus.yml.j2
@@ -58,7 +58,10 @@ services:
       - grafana
 {% if grafana_traefik_enable is defined %}
       - traefik
+{% endif %}
     labels:
+      com.centurylinklabs.watchtower.enable: {{ grafana_watchtower_enable | default('true') }}
+{% if grafana_traefik_enable is defined %}
       traefik.enable: true
       traefik.docker.network: traefik
       traefik.http.routers.grafana.rule: Host(`{{ grafana_domain|default(omit) }}`)
@@ -66,12 +69,11 @@ services:
       traefik.http.routers.grafana.tls.certresolver: letsencrypt
       traefik.http.routers.grafana.entrypoints: "{{ grafana_traefik_entrypoint }}"
       traefik.http.services.grafana.loadbalancer.server.port: 3000
-{% else %}
 {% if grafana_traefik_ipwhitelist is defined %}
       traefik.http.middlewares.grafana-clientips.ipwhitelist.sourcerange: {{ grafana_traefik_ipwhitelist }}
       traefik.http.routers.grafana.middlewares: "grafana-clientips@docker"
 {% endif %}
-      com.centurylinklabs.watchtower.enable: {{ grafana_watchtower_enable | default('true') }}
+{% else %}
     ports:
       - "{{ grafana_port | default(3000) }}:3000"
 {% endif %}