updating monitoring-ng to latest main version so secret length doesnt bone us

2026-07-16 21:04:28 -07:00
5 changed files with 32 additions and 65 deletions
@@ -1,40 +0,0 @@
-#SECRET_DB_PASSWORD_VERSION=v1
-#SECRET_SMTP_PASSWORD_VERSION=v1
-
-TYPE=ghost:1.5.0+6.65.0-alpine
-
-DOMAIN=blog.resisttechmonopolies.online
-
-## Domain aliases
-#EXTRA_DOMAINS=', `www.blog.resisttechmonopolies.online`'
-LETS_ENCRYPT_ENV=production
-
-SECRET_DB_PASSWORD_VERSION=v1
-
-SECRET_SMTP_PASSWORD_VERSION=v1
-
-## Mail settings (mandatory)
-MAIL_TRANSPORT=smtp
-MAIL_FROM=besties@resisttechmonopolies.online
-MAIL_OPTIONS_HOST=mail.resisttechmonopolies.online
-MAIL_OPTIONS_PORT=465
-MAIL_OPTIONS_AUTH_USER=besties@resisttechmonopolies.online
-#MAIL_OPTIONS_SECURE=false
-
-## Advanced options
-# see here: https://docs.ghost.org/config#number-of-connections
-#DATABASE_POOL_MIN=2
-#DATABASE_POOL_MAX=15
-
-COMPOSE_FILE="compose.yml"
-
-# Anubis
-#COMPOSE_FILE="$COMPOSE_FILE:compose.anubis.yml"
-
-## Matrix-Synapse-Redirection
-# COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml"
-# MATRIX_DOMAIN=matrix-synapse.example.com
-
-## Custom Image Version
-# COMPOSE_FILE="$COMPOSE_FILE:compose.customversion.yml"
-# IMAGE_VERSION=6.3.1
@@ -1,4 +1,4 @@
-TYPE=monitoring-ng:23b13cb8
+TYPE=monitoring-ng:main
 LETS_ENCRYPT_ENV=production
 COMPOSE_FILE=compose.yml
 DOMAIN=m.laylotta.resisttechmonopolies.online
@@ -6,14 +6,15 @@ TIMEOUT=120
 ENABLE_BACKUPS=true

 ## Enable this secret for Promtail / Prometheus
+COMPOSE_FILE="$COMPOSE_FILE:compose.basic-auth.yml"
 SECRET_BASIC_AUTH_VERSION=v1

 ## Promtail (Gathering Logs)
-COMPOSE_FILE="$COMPOSE_FILE:compose.promtail.yml"
-LOKI_PUSH_URL=https://loki.${DOMAIN}/loki/api/v1/push
+#COMPOSE_FILE="$COMPOSE_FILE:compose.promtail.yml"
+#LOKI_PUSH_URL=https://loki.${DOMAIN}/loki/api/v1/push

 ## Expose node and cadvisor ports instead of traefik
-COMPOSE_FILE="$COMPOSE_FILE:compose.expose-ports.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.expose-ports.yml"

 # Monitoring Server
 #
@@ -26,7 +27,7 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.pushgateway.yml"

 ## Loki
 # Loki Server
-COMPOSE_FILE="$COMPOSE_FILE:compose.loki.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.loki.yml"

 # Set to 0 to disable retention
 LOKI_RETENTION_PERIOD=744h
@@ -39,39 +40,40 @@ LOKI_STORAGE_FILESYSTEM=1
 # LOKI_ACCESS_KEY_ID=bush-debrief-approval-robust-scraggly-molecule
 # LOKI_BUCKET_NAMES=loki
 # SECRET_LOKI_AWS_SECRET_ACCESS_KEY_VERSION=v1
-#
+
 ## Grafana
-#
-# COMPOSE_FILE="$COMPOSE_FILE:compose.grafana.yml"
-# GF_SERVER_ROOT_URL=https://monitoring.example.com
-# SECRET_GRAFANA_ADMIN_PASSWORD_VERSION=v1
+COMPOSE_FILE="$COMPOSE_FILE:compose.grafana.yml"
+GF_SERVER_ROOT_URL=https://monitoring.${DOMAIN}
+SECRET_GF_ADMINPASSWD_VERSION=v1
 ## Seperate domain for Grafana
-#GRAFANA_DOMAIN=grafana.example.com
-#
+GRAFANA_DOMAIN=grafana.${DOMAIN}
+
 ## Single-Sign-On with OIDC
-# OIDC_ENABLED=1
-# SECRET_GRAFANA_OIDC_CLIENT_SECRET_VERSION=v1
-# OIDC_CLIENT_ID=grafana
-# OIDC_AUTH_URL="https://authentik.example.com/application/o/authorize/"
-# OIDC_API_URL="https://authentik.example.com/application/o/userinfo/"
-# OIDC_TOKEN_URL="https://authentik.example.com/application/o/token/"
-#
+COMPOSE_FILE="$COMPOSE_FILE:compose.grafana-oidc.yml"
+OIDC_ENABLED=1
+SECRET_GF_OIDC_SECRET_VERSION=v1
+OIDC_CLIENT_ID=grafana
+OIDC_AUTH_URL="https://auth.resisttechmonopolies.online/application/o/authorize/"
+OIDC_API_URL="https://auth.resisttechmonopolies.online/application/o/userinfo/"
+OIDC_TOKEN_URL="https://auth.resisttechmonopolies.online/application/o/token/"
+
 ## Additional grafana settings (unlikely to require editing)
 # GF_SECURITY_ALLOW_EMBEDDING=1
 # GF_INSTALL_PLUGINS=grafana-piechart-panel
 #
 ## grafana SMTP configuration (optional)
+# COMPOSE_FILE="$COMPOSE_FILE:compose.grafana-smtp.yml"
 # GF_SMTP_HOST=changeme
 # GF_SMTP_USER=changme
 # GF_SMTP_ENABLED=true
 # GF_SMTP_FROM_ADDRESS=grafana@example.com
 # GF_SMTP_SKIP_VERIFY=false
-# SECRET_GRAFANA_SMTP_PASSWORD_VERSION=v1
+SECRET_GF_SMTP_PASSWORD_VERSION=v1
 #

 ## Grafana Matrix Contact Point (optional)
 #COMPOSE_FILE="$COMPOSE_FILE:compose.matrix-alertmanager-receiver.yml"
-#SECRET_MATRIX_ACCESS_TOKEN_VERSION=v1
+#SECRET_MATRIX_TOKEN_VERSION=v1
 #GF_MATRIX_USER_ID="<user-id>"
 #GF_MATRIX_ROOM_ID="<room-id>"
 #GF_MATRIX_HOMESERVER_URL="<homeserver-url>"
@@ -81,4 +83,9 @@ LOKI_STORAGE_FILESYSTEM=1
 #ALERT_BACKUP_MISSING_ENABLED=true
 #ALERT_BACKUP_NOT_SUCCESSFULL_ENABLED=true
 #ALERT_NODE_DISK_SPACE_ENABLED=true
-#ALERT_NODE_MEMORY_USAGE_ENABLED=true
+#ALERT_NODE_MEMORY_USAGE_ENABLED=true
+# Node disk space alert will trigger when free disk space left is below the given number in percent
+#ALERT_NODE_DISK_SPACE_LEFT=10
+
+# Node memory usage alert will trigger when memory usage is above the given number in percent
+#ALERT_NODE_MEMORY_USAGE=85
@@ -1,4 +1,4 @@
-TYPE=backup-bot-two:2.4.0+2.4.0
+TYPE=backup-bot-two:2.3.0+2.3.0-beta

 SECRET_RESTIC_PASSWORD_VERSION=v1

@@ -1,4 +1,4 @@
-TYPE=uptime-kuma:3.3.0+2.5.3
+TYPE=uptime-kuma:3.0.0+2.2.1
 COMPOSE_FILE="compose.yml"
 LETS_ENCRYPT_ENV=production

@@ -1,4 +1,4 @@
-TYPE=vaultwarden:2.3.3+1.37.2
+TYPE=vaultwarden:2.1.3+1.35.4

 DOMAIN=vw.resisttechmonopolies.online
 LETS_ENCRYPT_ENV=production