Migration to newer dockge/compose stack

monitoring/compose.macvlan.yaml

@@ -0,0 +1,11 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
+
+services:
+  loki:
+    networks:
+      macvlan:
+        ipv4_address: ${NASCOMPOSE_MACVLAN_LOKI_IP?}
+
+networks:
+  macvlan:
+    external: true

monitoring/compose.yaml

@@ -1,36 +1,47 @@
-version: "3.8"
+# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
+
 services:
   loki:
+    extends:
+      file: ../compose.base.yaml
+      service: base-service
+    container_name: loki
     image: grafana/loki
+    #user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     command: -config.file=/etc/loki/local-config.yaml
     networks:
-      default: null
-      macvlan:
-        ipv4_address: ${NASCOMPOSE_MACVLAN_LOKI_IP?}
-    restart: unless-stopped
+      - default
   promtail:
+    extends:
+      file: ../compose.base.yaml
+      service: base-service
+    container_name: promtail
     image: grafana/promtail
+    command: -config.file=/etc/promtail/config.yaml
+    #user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     volumes:
       - /var/log:/var/log
-      - ${NASCOMPOSE_SERVICES?}/monitoring/config/promtail_config.yaml:/etc/promtail/config.yaml
-      - ${NASCOMPOSE_SERVICES?}/monitoring/volumes/promtail_logs/:/data/logs/
-    command: -config.file=/etc/promtail/config.yaml
-    restart: unless-stopped
+      - ./config/promtail_config.yaml:/etc/promtail/config.yaml
+      - ./volumes/promtail_logs/:/data/logs/
   grafana:
+    extends:
+      file: ../compose.base.yaml
+      service: exposed-service
+    container_name: grafana
     image: grafana/grafana-oss
     user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     volumes:
-      - ${NASCOMPOSE_SERVICES?}/monitoring/volumes/grafana_data/:/var/lib/grafana
-      - ${NASCOMPOSE_SERVICES?}/monitoring/config/grafana.ini:/etc/grafana/grafana.ini:ro
+      - ./volumes/grafana_data/:/var/lib/grafana
+      - ./config/grafana.ini:/etc/grafana/grafana.ini:ro
     networks:
-      - reverse-proxy
       - default
-    restart: unless-stopped
-    labels:
-      traefik.enable: true
   cadvisor:
+    extends:
+      file: ../compose.base.yaml
+      service: exposed-service
+    container_name: cadvisor
     image: gcr.io/cadvisor/cadvisor
-    hostname: cadvisor
+    #user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     command:
       - --enable_metrics=app,cpu,memory,network,oom_event,percpu
       - --store_container_labels=false
@@ -42,27 +53,23 @@ services:
       - /sys:/sys:ro
       - /var/packages/ContainerManager/var/docker/:/var/lib/docker:ro
     networks:
-      - reverse-proxy
       - default
-    restart: unless-stopped
     labels:
-      traefik.enable: true
       traefik.http.routers.cadvisor.middlewares: authelia@file
   prometheus:
+    extends:
+      file: ../compose.base.yaml
+      service: exposed-service
+    container_name: prometheus
     image: prom/prometheus
     user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     volumes:
-      - ${NASCOMPOSE_SERVICES?}/monitoring/config/prometheus_config/prometheus.yml:/etc/prometheus/prometheus.yml
-      - ${NASCOMPOSE_SERVICES?}/monitoring/volumes/prometheus_data/:/prometheus/
-    restart: unless-stopped
+      - ./config/prometheus_config/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./volumes/prometheus_data/:/prometheus/
     networks:
-      - reverse-proxy
       - default
     labels:
-      traefik.enable: true
       traefik.http.routers.prometheus.middlewares: authelia@file
 networks:
   reverse-proxy:
     external: true
-  macvlan:
-    external: true

monitoring/volumes/promtail_logs/.gitignore

@@ -0,0 +1,6 @@
+# Promtail logs volume is special as it contains folders which are symlinked to as volumes for other containers
+# Stop the parent .gitignore from impacting subfolders
+!*/
+# Ignore the content of all the subfolders
+*/*
+!.gitkeep