diff --git a/automation/docker-compose.yaml b/automation/docker-compose.yaml index 7f1ad68..7622965 100644 --- a/automation/docker-compose.yaml +++ b/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 diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index 6743351..8e1ac32 100644 --- a/monitoring/docker-compose.yaml +++ b/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,12 @@ services: - "traefik.http.routers.prometheus.service=prometheus" - "traefik.http.services.prometheus.loadbalancer.server.port=9090" + speedtest: + image: cs-git.ddnss.de/home/speedtest + container_name: speedtest + hostname: speedtest + restart: unless-stopped + cadvisor: image: gcr.io/cadvisor/cadvisor:v0.51.0 container_name: cadvisor @@ -118,9 +103,9 @@ 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}}" diff --git a/monitoring/watchtower-config.json b/monitoring/watchtower-config.json index e4cdd1e..a7b548c 100644 --- a/monitoring/watchtower-config.json +++ b/monitoring/watchtower-config.json @@ -1,8 +1,5 @@ { "auths": { - "cs-registry.ddnss.de": { - "auth": "Y2hyaXM6U2VjcmV0MTI=" - }, "https://index.docker.io/v1/": { "auth": "Y3MyMjExOkU2U2Njc3ViRFJrYUppMlNMVSUh" },