From 19464b32118096234bdd62b5edd8c8c8242c756d Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Wed, 20 Nov 2024 17:49:26 +0000 Subject: [PATCH] Add more uptime-kuma config --- servers/containers/autokuma.container | 22 ++++++++++++++----- .../containers/conduwuit-testing.container | 3 +-- servers/containers/conduwuit.container | 3 +-- servers/containers/coturn.container | 3 +-- servers/containers/domain-redirects.container | 1 + servers/containers/element-web.container | 3 ++- servers/containers/freshrss.container | 5 ++--- servers/containers/homepage.container | 2 ++ .../jade-website-frontend.container | 2 +- servers/containers/kanidm.container | 2 ++ servers/containers/matrix-sed.container | 1 + servers/containers/maubot.container | 4 ++-- servers/containers/mautrix-discord.container | 3 ++- .../containers/mautrix-gmessages.container | 3 ++- servers/containers/mautrix-signal.container | 3 +++ .../readability-js-server.container | 1 + servers/containers/sentry-relay.container | 2 ++ servers/containers/stalwart.container | 3 ++- servers/containers/thelounge.container | 2 ++ servers/containers/traefik.container | 2 ++ servers/containers/uptime-kuma.container | 3 ++- 21 files changed, 51 insertions(+), 22 deletions(-) diff --git a/servers/containers/autokuma.container b/servers/containers/autokuma.container index 4c67b791..3dbb8011 100644 --- a/servers/containers/autokuma.container +++ b/servers/containers/autokuma.container @@ -22,10 +22,16 @@ Environment=AUTOKUMA__KUMA__URL=https://uptime-kuma.ellis.link Environment="AUTOKUMA__KUMA__USERNAME=jade" Environment="AUTOKUMA__KUMA__PASSWORD=N3oPQ8aJ8rYh0PKTI6O0Kwz5GNIBy31Uhusy" Environment=AUTOKUMA__DOCKER__HOSTS=unix:///var/run/docker.sock -Environment=AUTOKUMA__SNIPPETS__WEB='\ - {{ container_name }}_http.http.name: {{ container_name }} HTTP\n\ - {{ container_name }}_http.http.url: https://{{ args[0] }}{% if args[1] %}:{{ args[1] }}{% endif %}\n\ - {{ container_name }}_docker.docker.name: {{ container_name }} Docker\n\ +Environment=AUTOKUMA__SNIPPETS__MONITOR='\ + {{ container_name }}_group.group.name: {{ container.Labels | get(key="homepage.name", default=container_name) }}\n\ + {{ container_name }}_group.group.description: {{ container.Labels | get(key="homepage.description", default="") }}\n\ + {% if container.Labels | get(key="homepage.siteMonitor") %}{{ container_name }}_http.http.name: {{ container.Labels | get(key="homepage.name", default=container_name) }} HTTP\n\ + {{ container_name }}_http.http.description: {{ container.Labels | get(key="homepage.description", default="") }}\n\ + {{ container_name }}_http.http.parent_name: {{ container_name }}_group\n\ + {{ container_name }}_http.http.url: {{ container.Labels | get(key="homepage.siteMonitor") }}\n{% endif %}\ + {{ container_name }}_docker.docker.name: {{ container.Labels | get(key="homepage.name", default=container_name) }} Docker\n\ + {{ container_name }}_docker.docker.description: {{ container.Labels | get(key="org.opencontainers.image.description", default=container.Labels | get(key="homepage.description", default="")) }}\n\ + {{ container_name }}_docker.docker.parent_name: {{ container_name }}_group\n\ {{ container_name }}_docker.docker.docker_container: {{ container_name }}\n\ {{ container_name }}_docker.docker.docker_host: 1' @@ -33,9 +39,15 @@ Label="homepage.group=Services" Label="homepage.name=AutoKuma" Label="homepage.description=Configure uptime monitoring" +# Label="kuma.podman_host.docker_host.name=Podman" +# Label="kuma.podman_host.docker_host.connection_type=socket" +# Label="kuma.podman_host.docker_host.path=/var/run/docker.sock" +# docker_host_name: podman_host + +Label=kuma.__monitor='' -StopTimeout=10 +StopTimeout=3 [Service] diff --git a/servers/containers/conduwuit-testing.container b/servers/containers/conduwuit-testing.container index f164b2c9..d0893484 100644 --- a/servers/containers/conduwuit-testing.container +++ b/servers/containers/conduwuit-testing.container @@ -33,8 +33,7 @@ Label="homepage.href=https://element.pissing.dev/" # Endpoint provided by sliding sync proxy used by some clients such as Element Web as a non-standard health check. Label="homepage.siteMonitor=https://matrix.pissing.dev/client/server.json" Label="homepage.description=Matrix homeserver (pissing.dev)" - -Label=kuma.__web='"matrix.pissing.dev"' +Label=kuma.__monitor='' Environment="CONDUWUIT_SERVER_NAME=pissing.dev" diff --git a/servers/containers/conduwuit.container b/servers/containers/conduwuit.container index 0c19a224..0809b84f 100644 --- a/servers/containers/conduwuit.container +++ b/servers/containers/conduwuit.container @@ -33,8 +33,7 @@ Label="homepage.href=https://element.ellis.link/" # Endpoint provided by sliding sync proxy used by some clients such as Element Web as a non-standard health check. Label="homepage.siteMonitor=https://matrix.ellis.link/client/server.json" Label="homepage.description=Matrix homeserver" - -Label=kuma.__web='"matrix.ellis.link"' +Label=kuma.__monitor='' Environment="CONDUWUIT_SERVER_NAME=ellis.link" diff --git a/servers/containers/coturn.container b/servers/containers/coturn.container index 695e6706..0e65f62d 100644 --- a/servers/containers/coturn.container +++ b/servers/containers/coturn.container @@ -39,9 +39,8 @@ Label="traefik.http.routers.coturn.rule=Host(`coturn.ellis.link`)" Label="homepage.group=Services" Label="homepage.name=coturn" # Label="homepage.href=https://coturn.ellis.link" - +Label=kuma.__monitor='' # Label="kuma.coturn.http.name=Uptime Kuma" -# Label=kuma.__web='"coturn.ellis.link"' StopTimeout=100 diff --git a/servers/containers/domain-redirects.container b/servers/containers/domain-redirects.container index a6427c56..4f01497c 100644 --- a/servers/containers/domain-redirects.container +++ b/servers/containers/domain-redirects.container @@ -39,6 +39,7 @@ Label="traefik.http.routers.domain-redirects.middlewares=default@file" # Label="traefik.http.middlewares.joel-ellis-link-redirect.redirectregex.permanent=true" Label="homepage.group=Services" Label="homepage.name=Redirector service" +Label=kuma.__monitor='' [Service] Restart=on-failure diff --git a/servers/containers/element-web.container b/servers/containers/element-web.container index 8a1c848f..9b82b8ec 100644 --- a/servers/containers/element-web.container +++ b/servers/containers/element-web.container @@ -34,7 +34,8 @@ Label="homepage.name=Element Web" # Endpoint provided by sliding sync proxy used by some clients such as Element Web as a non-standard health check. # Label="homepage.siteMonitor=https://matrix.pissing.dev/client/server.json" Label="homepage.description=Element Web for matrix servers" - +Label="homepage.siteMonitor=https://element.ellis.link" +Label=kuma.__monitor='' StopTimeout=100 diff --git a/servers/containers/freshrss.container b/servers/containers/freshrss.container index bef914f6..ab72fa8a 100644 --- a/servers/containers/freshrss.container +++ b/servers/containers/freshrss.container @@ -66,10 +66,9 @@ Environment=OIDC_SESSION_INACTIVITY_TIMEOUT=7200 Label="homepage.group=Public" Label="homepage.name=FreshRSS" Label="homepage.href=https://freshrss.ellis.link/" - -# Label="homepage.siteMonitor=" +Label="homepage.siteMonitor=https://freshrss.ellis.link/" Label="homepage.description=RSS feed reader" - +Label=kuma.__monitor='' StopTimeout=100 diff --git a/servers/containers/homepage.container b/servers/containers/homepage.container index a1803a68..b69b032b 100644 --- a/servers/containers/homepage.container +++ b/servers/containers/homepage.container @@ -33,6 +33,8 @@ Label="homepage.group=Public" Label="homepage.name=Homepage" Label="homepage.href=https://homepage.ellis.link/" Label="homepage.description=Here!" +Label="homepage.siteMonitor=https://homepage.ellis.link/" +Label=kuma.__monitor='' [Service] Restart=on-failure diff --git a/servers/containers/jade-website-frontend.container b/servers/containers/jade-website-frontend.container index 46b366f1..7d68be7f 100644 --- a/servers/containers/jade-website-frontend.container +++ b/servers/containers/jade-website-frontend.container @@ -40,8 +40,8 @@ Label="homepage.name=Website" Label="homepage.href=https://jade.ellis.link/" Label="homepage.siteMonitor=https://jade.ellis.link/" Label="homepage.description=My personal website!" +Label=kuma.__monitor='' -Label=kuma.__web='"jade.ellis.link"' [Service] Restart=on-failure diff --git a/servers/containers/kanidm.container b/servers/containers/kanidm.container index abdd1076..55a5df28 100644 --- a/servers/containers/kanidm.container +++ b/servers/containers/kanidm.container @@ -52,7 +52,9 @@ Label="traefik.http.routers.kanidm.middlewares=compress" # hsts, Label="homepage.group=Services" Label="homepage.name=Kanidm" Label="homepage.href=https://idm.ellis.link/" +Label="homepage.siteMonitor=https://idm.ellis.link/" Label="homepage.description=Identity server" +Label=kuma.__monitor='' [Service] diff --git a/servers/containers/matrix-sed.container b/servers/containers/matrix-sed.container index e681dafa..4d37702e 100644 --- a/servers/containers/matrix-sed.container +++ b/servers/containers/matrix-sed.container @@ -21,6 +21,7 @@ Label="traefik.enable=false" Label="homepage.group=Services" Label="homepage.name=Matrix Sed bot" Label="homepage.description=@sed:ellis.link" +Label=kuma.__monitor='' #Environment="MATRIX_SERVER=https://matrix.ellis.link" diff --git a/servers/containers/maubot.container b/servers/containers/maubot.container index 31290bf1..04e3eace 100644 --- a/servers/containers/maubot.container +++ b/servers/containers/maubot.container @@ -28,9 +28,9 @@ Label="homepage.group=Services" Label="homepage.name=Maubot" Label="homepage.href=https://maubot.ellis.link/" # https://github.com/girlbossceo/conduwuit/blob/032b199129f8648a77bde285f755a78e9ec349a7/src/api/client/unversioned.rs#L142 -# Label="homepage.siteMonitor=" +Label="homepage.siteMonitor=https://maubot.ellis.link/" Label="homepage.description=Matrix bot" - +Label=kuma.__monitor='' StopTimeout=100 diff --git a/servers/containers/mautrix-discord.container b/servers/containers/mautrix-discord.container index 9642487c..7f939dbb 100644 --- a/servers/containers/mautrix-discord.container +++ b/servers/containers/mautrix-discord.container @@ -25,8 +25,9 @@ Label="traefik.http.routers.mautrix-discord.middlewares=default@file" Label="homepage.group=Services" Label="homepage.name=mautrix-discord" # Label="homepage.href=https://jade.ellis.link/" -# Label="homepage.siteMonitor=https://matrix.ellis.link/client/server.json" +Label="homepage.siteMonitor=https://mautrix-discord.ellis.link/_matrix/mau/ready" Label="homepage.description=Matrix bridge" +Label=kuma.__monitor='' StopTimeout=100 diff --git a/servers/containers/mautrix-gmessages.container b/servers/containers/mautrix-gmessages.container index a615204c..474d5d72 100644 --- a/servers/containers/mautrix-gmessages.container +++ b/servers/containers/mautrix-gmessages.container @@ -23,8 +23,9 @@ Label="traefik.http.routers.mautrix-gmessages.middlewares=default@file" Label="homepage.group=Services" Label="homepage.name=mautrix-gmessages" # Label="homepage.href=https://jade.ellis.link/" -# Label="homepage.siteMonitor=https://matrix.ellis.link/client/server.json" Label="homepage.description=Matrix bridge" +Label="homepage.siteMonitor=https://mautrix-gmessages.ellis.link/_matrix/mau/ready" +Label=kuma.__monitor='' StopTimeout=100 diff --git a/servers/containers/mautrix-signal.container b/servers/containers/mautrix-signal.container index 59609a93..93af7b28 100644 --- a/servers/containers/mautrix-signal.container +++ b/servers/containers/mautrix-signal.container @@ -25,6 +25,9 @@ Label="homepage.name=mautrix-signal" # Label="homepage.href=https://jade.ellis.link/" # Label="homepage.siteMonitor=https://matrix.ellis.link/client/server.json" Label="homepage.description=Matrix bridge" +Label="homepage.siteMonitor=https://mautrix-signal.ellis.link/_matrix/mau/ready" +# https://github.com/mautrix/go/blob/d89912cfcb416ffe26101790c043dd47e4508811/appservice/appservice.go#L69 +Label=kuma.__monitor='' StopTimeout=100 diff --git a/servers/containers/readability-js-server.container b/servers/containers/readability-js-server.container index 59e535c0..d6d5660c 100644 --- a/servers/containers/readability-js-server.container +++ b/servers/containers/readability-js-server.container @@ -20,6 +20,7 @@ Label="traefik.enable=false" Label="homepage.group=Services" Label="homepage.name=Readability API" Label="homepage.description=readability-js-server API" +Label=kuma.__monitor='' [Service] diff --git a/servers/containers/sentry-relay.container b/servers/containers/sentry-relay.container index 2b9ccdaf..ff14d5c0 100644 --- a/servers/containers/sentry-relay.container +++ b/servers/containers/sentry-relay.container @@ -31,6 +31,8 @@ Label="traefik.http.routers.sentry-relay.middlewares=default@file" Label="homepage.group=Services" Label="homepage.name=Sentry Relay" Label="homepage.href=https://relay.ellis.link/" +Label="homepage.siteMonitor=https://relay.ellis.link" +Label=kuma.__monitor='' [Service] Restart=on-failure diff --git a/servers/containers/stalwart.container b/servers/containers/stalwart.container index ad14a3a6..5879986b 100644 --- a/servers/containers/stalwart.container +++ b/servers/containers/stalwart.container @@ -33,8 +33,9 @@ Label="homepage.group=Public" Label="homepage.name=Stalwart Mail" Label="homepage.href=https://mail.ellis.link/" -# Label="homepage.siteMonitor=" Label="homepage.description=AIO mail server" +Label="homepage.siteMonitor=https://mail.ellis.link" +Label=kuma.__monitor='' diff --git a/servers/containers/thelounge.container b/servers/containers/thelounge.container index b81e09fd..aba9cd97 100644 --- a/servers/containers/thelounge.container +++ b/servers/containers/thelounge.container @@ -30,7 +30,9 @@ Label="traefik.http.routers.thelounge.middlewares=hsts,compress" Label="homepage.group=Public" Label="homepage.name=TheLounge" Label="homepage.href=https://thelounge.ellis.link/" +Label="homepage.siteMonitor=https://thelounge.ellis.link/" Label="homepage.description=IRC web client / bouncer" +Label=kuma.__monitor='' [Service] Restart=on-failure diff --git a/servers/containers/traefik.container b/servers/containers/traefik.container index 73085518..3c14a764 100644 --- a/servers/containers/traefik.container +++ b/servers/containers/traefik.container @@ -111,6 +111,8 @@ Label="traefik.http.middlewares.hsts.headers.isdevelopment=false" Label="homepage.group=Services" Label="homepage.name=Traefik" +Label=kuma.__monitor='' + [Service] Restart=on-failure TimeoutStartSec=900 diff --git a/servers/containers/uptime-kuma.container b/servers/containers/uptime-kuma.container index 050938d3..1203ba43 100644 --- a/servers/containers/uptime-kuma.container +++ b/servers/containers/uptime-kuma.container @@ -31,7 +31,8 @@ Label="homepage.siteMonitor=https://uptime-kuma.ellis.link" Label="homepage.description=Uptime monitoring" # Label="kuma.uptime-kuma.http.name=Uptime Kuma" -Label=kuma.__web='"uptime-kuma.ellis.link"' + +Label=kuma.__monitor='' StopTimeout=100