From 7f70bd2acbdf6c20db353817e3893d4f14454372 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 7 Apr 2026 14:51:15 +1000 Subject: [PATCH] modified: core/authelia/configuration.yml modified: core/test/docker-compose.yml modified: monitoring/node-red/Dockerfile modified: monitoring/node-red/docker-compose.yml modified: monitoring/prometheus/docker-compose.yml modified: monitoring/prometheus/prometheus.yml modified: update-containers.log --- core/authelia/configuration.yml | 7 +++++ core/test/docker-compose.yml | 2 +- monitoring/node-red/Dockerfile | 1 + monitoring/node-red/docker-compose.yml | 5 +++- monitoring/prometheus/docker-compose.yml | 38 ++++++++++++------------ monitoring/prometheus/prometheus.yml | 1 + update-containers.log | 26 ++++++++-------- 7 files changed, 46 insertions(+), 34 deletions(-) diff --git a/core/authelia/configuration.yml b/core/authelia/configuration.yml index b27674e..5c0c2cf 100644 --- a/core/authelia/configuration.yml +++ b/core/authelia/configuration.yml @@ -35,6 +35,13 @@ access_control: - "^/health" policy: bypass + - domain: node-red.lan.ddnsgeek.com + resources: + - "^/health" + - "^/uptime-kuma" + - "^/docker-update-lockouts/clear" + policy: bypass + - domain: prometheus.lan.ddnsgeek.com resources: - "^/-/healthy" diff --git a/core/test/docker-compose.yml b/core/test/docker-compose.yml index 23b7bfc..5696354 100644 --- a/core/test/docker-compose.yml +++ b/core/test/docker-compose.yml @@ -1,6 +1,6 @@ services: update-test: - image: nginx:1.27.4 + image: nginx:1.28.1 container_name: update-test profiles: ["test"] healthcheck: diff --git a/monitoring/node-red/Dockerfile b/monitoring/node-red/Dockerfile index 6bf9008..0730c1d 100644 --- a/monitoring/node-red/Dockerfile +++ b/monitoring/node-red/Dockerfile @@ -3,4 +3,5 @@ FROM nodered/node-red:latest USER root RUN apk add --no-cache docker-cli docker-cli-compose RUN addgroup -g 131 -S docker && addgroup node-red docker + USER node-red diff --git a/monitoring/node-red/docker-compose.yml b/monitoring/node-red/docker-compose.yml index 5f6343d..16f6daf 100644 --- a/monitoring/node-red/docker-compose.yml +++ b/monitoring/node-red/docker-compose.yml @@ -7,12 +7,15 @@ services: profiles: ["monitoring","all"] restart: unless-stopped privileged: true + environment: + - TZ=${TZ} # ports: # - "1880:1880" volumes: - ${PROJECT_ROOT}/monitoring/node-red/data:/data - /var/run/docker.sock:/var/run/docker.sock:rw - - ${PROJECT_ROOT}:/compose + - ${PROJECT_ROOT}:/compose/docker:ro + - /home/nixos/raspi:/compose/raspi:ro - ${PROJECT_ROOT}/default-environment.env:/usr/src/node-red/default-environment.env:ro - ${PROJECT_ROOT}/default-network.yml:/usr/src/node-red/default-network.yml:ro - ${PROJECT_ROOT}/core/docker-compose.yml:/usr/src/node-red/core/docker-compose.yml:ro diff --git a/monitoring/prometheus/docker-compose.yml b/monitoring/prometheus/docker-compose.yml index dbcfc88..11dfb51 100644 --- a/monitoring/prometheus/docker-compose.yml +++ b/monitoring/prometheus/docker-compose.yml @@ -162,30 +162,30 @@ services: # - ${PROJECT_ROOT}/monitoring/docker-exporter/data:/data:rw # - ${PROJECT_ROOT}/services-up.sh:/app/services-up.sh:ro environment: - LOG_LEVEL: DEBUG + LOG_LEVEL: INFO volumes: - ~/.docker/config.json:/root/.docker/config.json:ro - /var/run/docker.sock:/var/run/docker.sock - ${PROJECT_ROOT}/monitoring/docker-exporter/data:/data:rw - - ${PROJECT_ROOT}:/compose - - ${PROJECT_ROOT}/default-environment.env:/compose/default-environment.env:ro - - ${PROJECT_ROOT}/default-network.yml:/compose/default-network.yml:ro - - ${PROJECT_ROOT}/core/docker-compose.yml:/compose/core/docker-compose.yml:ro - - ${PROJECT_ROOT}/monitoring/prometheus/docker-compose.yml:/compose/monitoring/prometheus/docker-compose.yml:ro - - ${PROJECT_ROOT}/monitoring/gotify/docker-compose.yml:/compose/monitoring/gotify/docker-compose.yml:ro - - ${PROJECT_ROOT}/monitoring/grafana/docker-compose.yml:/compose/monitoring/grafana/docker-compose.yml:ro - - ${PROJECT_ROOT}/monitoring/portainer/docker-compose.yml:/compose/monitoring/portainer/docker-compose.yml:ro - - ${PROJECT_ROOT}/monitoring/uptime-kuma/docker-compose.yml:/compose/monitoring/uptime-kuma/docker-compose.yml:> - - ${PROJECT_ROOT}/apps/gitea/docker-compose.yml:/compose/apps/gitea/docker-compose.yml:ro - - ${PROJECT_ROOT}/apps/gramps/docker-compose.yml:/compose/apps/gramps/docker-compose.yml:ro - - ${PROJECT_ROOT}/apps/nextcloud/docker-compose.yml:/compose/apps/nextcloud/docker-compose.yml:ro - - ${PROJECT_ROOT}/apps/passbolt/docker-compose.yml:/compose/apps/passbolt/docker-compose.yml:ro - - ${PROJECT_ROOT}/apps/searxng/docker-compose.yml:/compose/apps/searxng/docker-compose.yml:ro - - ${PROJECT_ROOT}/apps/shift-recorder/docker-compose.yml:/compose/apps/shift-recorder/docker-compose.yml:ro - - ${PROJECT_ROOT}/apps/stockfill/docker-compose.yml:/compose/apps/stockfill/docker-compose.yml:ro - - ${PROJECT_ROOT}/monitoring/node-red/docker-compose.yml:/compose/monitoring/node-red/docker-compose.yml:ro - - ${PROJECT_ROOT}/core/test/docker-compose.yml:/compose/core/test/docker-compose.yml:ro + - ${PROJECT_ROOT}:/compose:ro +# - ${PROJECT_ROOT}/default-environment.env:/compose/default-environment.env:ro +# - ${PROJECT_ROOT}/default-network.yml:/compose/default-network.yml:ro +# - ${PROJECT_ROOT}/core/docker-compose.yml:/compose/core/docker-compose.yml:ro +# - ${PROJECT_ROOT}/monitoring/prometheus/docker-compose.yml:/compose/monitoring/prometheus/docker-compose.yml:ro +# - ${PROJECT_ROOT}/monitoring/gotify/docker-compose.yml:/compose/monitoring/gotify/docker-compose.yml:ro +# - ${PROJECT_ROOT}/monitoring/grafana/docker-compose.yml:/compose/monitoring/grafana/docker-compose.yml:ro +# - ${PROJECT_ROOT}/monitoring/portainer/docker-compose.yml:/compose/monitoring/portainer/docker-compose.yml:ro +# - ${PROJECT_ROOT}/monitoring/uptime-kuma/docker-compose.yml:/compose/monitoring/uptime-kuma/docker-compose.yml:> +# - ${PROJECT_ROOT}/apps/gitea/docker-compose.yml:/compose/apps/gitea/docker-compose.yml:ro +# - ${PROJECT_ROOT}/apps/gramps/docker-compose.yml:/compose/apps/gramps/docker-compose.yml:ro +# - ${PROJECT_ROOT}/apps/nextcloud/docker-compose.yml:/compose/apps/nextcloud/docker-compose.yml:ro +# - ${PROJECT_ROOT}/apps/passbolt/docker-compose.yml:/compose/apps/passbolt/docker-compose.yml:ro +# - ${PROJECT_ROOT}/apps/searxng/docker-compose.yml:/compose/apps/searxng/docker-compose.yml:ro +# - ${PROJECT_ROOT}/apps/shift-recorder/docker-compose.yml:/compose/apps/shift-recorder/docker-compose.yml:ro +# - ${PROJECT_ROOT}/apps/stockfill/docker-compose.yml:/compose/apps/stockfill/docker-compose.yml:ro +# - ${PROJECT_ROOT}/monitoring/node-red/docker-compose.yml:/compose/monitoring/node-red/docker-compose.yml:ro +# - ${PROJECT_ROOT}/core/test/docker-compose.yml:/compose/core/test/docker-compose.yml:ro # ports: diff --git a/monitoring/prometheus/prometheus.yml b/monitoring/prometheus/prometheus.yml index 283d254..00ff587 100644 --- a/monitoring/prometheus/prometheus.yml +++ b/monitoring/prometheus/prometheus.yml @@ -63,6 +63,7 @@ scrape_configs: static_configs: - targets: - telegraf:9273 + - raspberrypi.tail13f623.ts.net:9273 labels: role: docker diff --git a/update-containers.log b/update-containers.log index ebc4cb1..1c1982c 100644 --- a/update-containers.log +++ b/update-containers.log @@ -1,13 +1,13 @@ -07:29:20 INFO: === Update started: 2026-04-01 07:29:20 === -07:29:20 WARNING: Skipping traefik (directory does not exist) -07:29:20 WARNING: Skipping nextcloud (directory does not exist) -07:29:20 WARNING: Skipping passbolt (directory does not exist) -07:29:20 WARNING: Skipping searxng (directory does not exist) -07:29:20 WARNING: Skipping gitea (directory does not exist) -07:29:20 WARNING: Skipping gotify (directory does not exist) -07:29:20 WARNING: Skipping grafana (directory does not exist) -07:29:20 WARNING: Skipping gramps (directory does not exist) -07:29:20 WARNING: Skipping portainer (directory does not exist) -07:29:20 WARNING: Skipping prometheus (directory does not exist) -07:29:20 WARNING: Skipping uptime-kuma (directory does not exist) -07:29:20 INFO: Pruning unused containers, images, networks, and volumes... +12:23:36 INFO: === Update started: 2026-04-04 12:23:36 === +12:23:36 WARNING: Skipping traefik (directory does not exist) +12:23:36 WARNING: Skipping nextcloud (directory does not exist) +12:23:36 WARNING: Skipping passbolt (directory does not exist) +12:23:36 WARNING: Skipping searxng (directory does not exist) +12:23:36 WARNING: Skipping gitea (directory does not exist) +12:23:36 WARNING: Skipping gotify (directory does not exist) +12:23:36 WARNING: Skipping grafana (directory does not exist) +12:23:36 WARNING: Skipping gramps (directory does not exist) +12:23:36 WARNING: Skipping portainer (directory does not exist) +12:23:36 WARNING: Skipping prometheus (directory does not exist) +12:23:36 WARNING: Skipping uptime-kuma (directory does not exist) +12:23:36 INFO: Pruning unused containers, images, networks, and volumes...