Remove gatus group (use host)

playbooks/roles/gatus/defaults/main.yml

@@ -9,7 +9,7 @@ gatus_federation_tester: "https://federationtester.matrix.org/api/report?server_
 gatus_endpoints_other:
   - name: matrix-federation
     url: "{{ gatus_federation_tester }}"
-    group: 9-external
+    group: external
     interval: 5m
     conditions:
       - '[STATUS] == 200'
@@ -23,7 +23,7 @@ gatus_endpoints_other:
         send-on-resolved: true
   - name: healthchecks-io
     url: "{{ opentofu.healthchecksio.status.ping_url }}"
-    group: 9-external
+    group: external
     interval: 5m
     conditions:
       - '[STATUS] == 200'

playbooks/roles/gatus/filter_plugins/gatus.py

@@ -23,7 +23,7 @@ class FilterModule(object):
             result.append({
                 "name": host["hostname"],
                 "url": f"icmp://{host['fqdn']}",
-                "group": "1-hosts",
+                "group": host["hostname"],
                 "conditions": [
                     "[CONNECTED] == true",
                 ],
@@ -45,7 +45,7 @@ class FilterModule(object):
                 continue
             result.append({
                 "name": f"backup@{name}",
-                "group": "8-backups",
+                "group": name,
                 "token": host_data["host_backup_gatus_token"],
                 "alerts": backup_alerts,
             })
@@ -85,7 +85,7 @@ class FilterModule(object):
 
                 new_endpoint = {
                     "name": name,
-                    "group": mon.get("group"),
+                    "group": service.get("host"),
                     "url": url,
                     "conditions": conditions,
                     "interval": mon.get("interval"),

services.auto.tfvars

@@ -1,11 +1,3 @@
-# Groups:
-## 1-hosts
-## 3-services
-## 4-websites
-## 7-support
-## 8-backup
-## 9-external
-
 services = {
   "acme_dns" = {
     host = "node001"
@@ -14,7 +6,6 @@ services = {
     }]
     monitoring = {
       url = "/health"
-      group = "7-support"
     }
     ports = [
       {
@@ -47,7 +38,6 @@ services = {
     }]
     monitoring = {
       url = "/-/health/live/"
-      group = "3-services"
     }
     certificates = [{
       domain = "auth.serguzim.me"
@@ -112,7 +102,6 @@ services = {
       }
     ]
     monitoring = {
-      group = "3-services"
     }
     auth = false
     database = false
@@ -127,7 +116,6 @@ services = {
       },
     ]
     monitoring = {
-      group = "7-support"
     }
     auth = false
     database = false
@@ -174,7 +162,6 @@ services = {
       path = "/var/lib/dokku"
     }]
     monitoring = {
-      group = "7-support"
       url = "https://serguzim.me/"
     }
     ports = [
@@ -223,7 +210,6 @@ services = {
   #  }]
   #  monitoring = {
   #    url = "https://multiplayer.factorio.com/get-game-details/91.107.211.57:34197"
-  #    group = "3-services"
   #    interval = "5m"
   #    conditions = [
   #      "DEFAULT",
@@ -263,7 +249,6 @@ services = {
     #}]
     monitoring = {
       url = "/api/v1/version"
-      group = "3-services"
     }
     ports = [
       {
@@ -331,7 +316,6 @@ services = {
     }]
     monitoring = {
       url = "/api/v1/status"
-      group = "3-services"
       conditions = [
         "DEFAULT",
         "[BODY].health == true"
@@ -358,7 +342,6 @@ services = {
       }
     ]
     monitoring = {
-      group = "3-services"
     }
     auth = false
     auth_redirects = ["https://gallery.serguzim.me/auth/login"]
@@ -369,7 +352,6 @@ services = {
   "immich_worker" = {
     host = "node004"
     monitoring = {
-      group = "7-support"
     }
     auth = false
     database = false
@@ -392,7 +374,6 @@ services = {
     ]
     monitoring = {
       url = "/health"
-      group = "3-services"
       conditions = [
         "DEFAULT",
         "[BODY] == Healthy"
@@ -416,7 +397,6 @@ services = {
     }]
     monitoring = {
       url = "/"
-      group = "3-services"
     }
     auth = false
     database = false
@@ -433,7 +413,6 @@ services = {
     }]
     monitoring = {
       url = "starttls://mail.serguzim.me:587"
-      group = "3-services"
       conditions = [
         "[CONNECTED] == true",
         "[CERTIFICATE_EXPIRATION] > 48h"
@@ -505,7 +484,6 @@ services = {
     ]
     monitoring = {
       url = "tcp://minecraft.serguzim.me:25565"
-      group = "3-services"
       conditions = [
         "[CONNECTED] == true"
       ]
@@ -536,7 +514,6 @@ services = {
     }]
     monitoring = {
       url = "/minio/health/live"
-      group = "7-support"
     }
     auth = false
     auth_redirects = ["https://console.s3.serguzim.me/oauth_callback"]
@@ -557,7 +534,6 @@ services = {
     }]
     monitoring = {
       url = "/v1/health"
-      group = "3-services"
       conditions = [
         "DEFAULT",
         "[BODY].healthy == true"
@@ -580,7 +556,6 @@ services = {
       }
     ]
     monitoring = {
-      group = "3-services"
     }
     auth = false
     database = true
@@ -634,7 +609,6 @@ services = {
     }]
     monitoring = {
       url = "tcp://db.serguzim.me:5432"
-      group = "7-support"
       conditions = [
         "[CONNECTED] == true"
       ]
@@ -669,7 +643,6 @@ services = {
       type = "docker"
     }]
     monitoring = {
-      group = "4-websites"
     }
     auth = false
     database = false
@@ -694,7 +667,6 @@ services = {
     ]
     monitoring = {
       url = "/rest/health"
-      group = "3-services"
       conditions = [
         "DEFAULT",
         "[BODY].status == pass"
@@ -725,7 +697,6 @@ services = {
     }]
     monitoring = {
       url = "/_matrix/client/versions"
-      group = "3-services"
     }
     ports = [
       {
@@ -752,7 +723,6 @@ services = {
     }]
     monitoring = {
       url = "/accounts/login/"
-      group = "3-services"
     }
     auth = false
     database = true
@@ -770,7 +740,6 @@ services = {
       type = "docker"
     }]
     monitoring = {
-      group = "7-support"
     }
     ports = [
       {
@@ -803,7 +772,6 @@ services = {
     }]
     monitoring = {
       url = "/tt-rss/"
-      group = "3-services"
     }
     auth = false
     database = true
@@ -816,7 +784,6 @@ services = {
     }]
     monitoring = {
       url = "/api/heartbeat"
-      group = "3-services"
     }
     auth = false
     database = true
@@ -836,7 +803,6 @@ services = {
     }]
     monitoring = {
       url = "/api/v1/info"
-      group = "3-services"
     }
     auth = true
     auth_redirects = ["https://todo.serguzim.me/auth/openid/authserguzimme"]
@@ -858,7 +824,6 @@ services = {
     }]
     monitoring = {
       url = "/info"
-      group = "3-services"
     }
     auth = false
     database = false
@@ -870,7 +835,6 @@ services = {
       domain = "wiki.serguzim.me"
     }]
     monitoring = {
-      group = "3-services"
     }
     auth = true
     auth_redirects = ["https://wiki.serguzim.me/login/f792bc7d-1a25-4437-944e-55eaf0111102/callback"]
@@ -896,7 +860,6 @@ services = {
     #}]
     monitoring = {
       url = "/healthz"
-      group = "3-services"
     }
     auth = false
     database = true

variables.tf

@@ -144,7 +144,6 @@ variable "services" {
     })))
     monitoring = optional(object({
       url   = optional(string)
-      group = optional(string)
       interval = optional(string)
       conditions = optional(list(string))
     }))