build

__swarm/grafana/grafana-swarm.yml

@@ -1,9 +1,10 @@
+name: grafana
 networks:
-  loki: null
+  loki:
 volumes:
-  grafana-data:
+  loki_data:
-  grafana-certs:
+  grafana_data:
-
+  grafana_certs:
 services:
   grafana:
     entrypoint:
@@ -35,11 +36,14 @@ services:
     networks:
     - loki
     ports:
-    - 3007:3000
+    - target: 3000
+      published: 3007
+      protocol: tcp
+      mode: ingress
     user: 0:0
     volumes:
-    - grafana-data:/var/lib/grafana
+    - grafana_data:/var/lib/grafana
-    - grafana-certs:/certs
+    - grafana_certs:/certs
     deploy:
       labels:
         com.centurylinklabs.watchtower.enable: 'true'
@@ -60,10 +64,15 @@ services:
   loki:
     command: -config.file=/etc/loki/local-config.yaml
     image: ${DOCKER_REGISTRY:-}grafana/loki:latest
+    volumes:
+    - loki_data:/loki
     networks:
     - loki
     ports:
-    - 3100:3100
+    - target: 3100
+      published: 3100
+      protocol: tcp
+      mode: ingress
     deploy:
       labels:
         wud.watch: 'true'
@@ -80,6 +89,7 @@ services:
     volumes:
     - /var/log:/var/log
     - /share/docker_data/grafana/promtail/config.yml:/etc/promtail/config.yml
+    - /share/Data/__GITLAB/omv_backup/:/share/Data/__GITLAB/omv_backup/
     deploy:
       labels:
         wud.watch: 'true'

grafana/docker-compose.yml

@@ -2,9 +2,9 @@ name: grafana
 networks:
   loki: null
 volumes:
-  loki-data:
+  loki_data:
-  grafana-data:
+  grafana_data:
-  grafana-certs:
+  grafana_certs:
 services:
   grafana:
     container_name: grafana
@@ -53,13 +53,13 @@ services:
     restart: ${RESTART:-unless-stopped}
     user: 0:0
     volumes:
-    - /share/docker_data/grafana/data:/var/lib/grafana
+    - grafana_data:/var/lib/grafana
-    - /share/docker_data/grafana/certs:/certs
+    - grafana_certs:/certs
   loki:
     command: -config.file=/etc/loki/local-config.yaml
     image: ${DOCKER_REGISTRY:-}grafana/loki:latest
     volumes:
-      - loki-data:/loki
+      - loki_data:/loki
     labels:
       wud.watch: true
       wud.watch.digest: true