Extend monitoring with glances.

automation/docker-compose.yaml

@@ -41,6 +41,7 @@ services:
       - "traefik.http.routers.semaphore.rule=Host(`semaphore.lan`)"
       - "traefik.http.routers.semaphore.service=semaphore"
       - "traefik.http.services.semaphore.loadbalancer.server.port=3000"
+      - "com.centurylinklabs.watchtower.monitor-only=true"
 
   semaphore-db:
     image: mysql:8

monitoring/.gitignore

@@ -0,0 +1 @@
+speedtest.csv

monitoring/docker-compose.yaml

@@ -12,29 +12,8 @@ volumes:
     name: grafana
 
 services:
-  apc:
-    image: cs-registry.ddnss.de/home/apc
-    container_name: apc
-    hostname: apc
-    tty: true
-    devices:
-      - /dev/usb/hiddev0
-    networks:
-      - proxy
-      - monitoring
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.apc.rule=Host(`apc.lan`)"
-      - "traefik.http.routers.apc.entrypoints=web"
-      - "traefik.http.routers.apc.service=apc"
-      - "traefik.http.services.apc.loadbalancer.server.port=9162"
-    ports:
-      - "3551:3551/tcp"
-      - "3551:3551/udp"
-    restart: unless-stopped
-
   prometheus:
-    image: cs-registry.ddnss.de/home/prometheus
+    image: cs-git.ddnss.de/home/prometheus
     container_name: prometheus
     hostname: prometheus
     restart: unless-stopped
@@ -49,6 +28,41 @@ services:
       - "traefik.http.routers.prometheus.service=prometheus"
       - "traefik.http.services.prometheus.loadbalancer.server.port=9090"
 
+  glances:
+    image: cs-git.ddnss.de/home/glances
+    container_name: glances
+    restart: unless-stopped
+    pid: host
+    networks:
+      - proxy
+      - monitoring
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /etc/os-release:/etc/os-release:ro
+    environment:
+      GLANCES_OPT: "-w"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.glances.rule=Host(`glances.lan`)"
+      - "traefik.http.routers.glances.entrypoints=web"
+      - "traefik.http.routers.glances.service=glances"
+      - "traefik.http.services.glances.loadbalancer.server.port=61208"
+
+  speedtest:
+    image: cs-git.ddnss.de/home/speedtest-web
+    container_name: speedtest-web
+    restart: unless-stopped
+    volumes:
+      - /media/backup/speedtest.csv:/var/www/html/speedtest.csv
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.speedtest.rule=Host(`speedtest.fam-steinle.de`)"
+      - "traefik.http.routers.speedtest.entrypoints=web"
+      - "traefik.http.routers.speedtest.service=speedtest"
+      - "traefik.http.services.speedtest.loadbalancer.server.port=8080"
+
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:v0.51.0
     container_name: cadvisor
@@ -118,10 +132,10 @@ services:
       - ./watchtower-config.json:/config.json
     environment:
       WATCHTOWER_INCLUDE_STOPPED: true
-      WATCHTOWER_MONITOR_ONLY: true
+      WATCHTOWER_MONITOR_ONLY: false
       WATCHTOWER_WARN_ON_HEAD_FAILURE: "never"
-      WATCHTOWER_SCHEDULE: "0 20 8 * * *"
+      WATCHTOWER_SCHEDULE: "0 20 4 * * *"
       WATCHTOWER_NOTIFICATIONS: "shoutrrr"
       WATCHTOWER_NOTIFICATION_URL: "mattermost://watchtower@cs-mm.ddnss.de/og4ckuqet7fafb8kjuaigzuh7c"
-      WATCHTOWER_NOTIFICATION_TEMPLATE: "{{range .}}{{.Time.Format \"2006-01-02 15:04:05\"}} ({{.Level}}): {{.Message}}{{println}}{{end}}"
+      WATCHTOWER_NOTIFICATION_TEMPLATE: "{{range .}} Homeserver - {{.Time.Format \"2006-01-02 15:04:05\"}} ({{.Level}}): {{.Message}}{{println}}{{end}}"
 

monitoring/watchtower-config.json

@@ -1,8 +1,5 @@
 {
 	"auths": {
-		"cs-registry.ddnss.de": {
-			"auth": "Y2hyaXM6U2VjcmV0MTI="
-		},
 		"https://index.docker.io/v1/": {
 			"auth": "Y3MyMjExOkU2U2Njc3ViRFJrYUppMlNMVSUh"
 		},

power-consumption/docker-compose.yaml

@@ -26,7 +26,7 @@ services:
       - "traefik.http.routers.power-consumption.entrypoints=web"
       - "traefik.http.routers.power-consumption.rule=Host(`power-consumption.lan`)"
       - "traefik.http.routers.power-consumption.service=power-consumption"
-      - "traefik.http.services.power-consumption.loadbalancer.server.port=80"
+      - "traefik.http.services.power-consumption.loadbalancer.server.port=8080"
 
   power-consumption-db:
     image: mysql:8