Merge branch 'master' of https://git.dvirlabs.com/dvirlabs/apps-gitops

.trigger

@@ -93,3 +93,6 @@
 # trigger at Fri Jul 18 10:43:02 UTC 2025 by my-apps
 # trigger at Fri Jul 18 10:45:49 UTC 2025 by my-apps
 # trigger at Fri Jul 18 10:47:31 UTC 2025 by observability-stack
+# trigger at Fri Jul 18 16:18:40 UTC 2025 by my-apps
+# trigger at Sat Jul 19 18:48:40 UTC 2025 by my-apps
+# trigger at Sat Jul 19 18:51:53 UTC 2025 by my-apps

.woodpecker.yml

@@ -49,6 +49,7 @@ steps:
     commands:
       - apk add --no-cache git curl bash
       - pip install pyyaml requests
+      - pip install uptime_kuma_api
       - python3 automation/uptime-kuma/sync_kuma.py
     environment:
       GIT_TOKEN:

automation/uptime-kuma/sync_kuma.py

@@ -1,80 +1,110 @@
 import os
-import requests
 import yaml
 import subprocess
+from uptime_kuma_api import UptimeKumaApi, MonitorType, AuthMethod
 
 KUMA_URL = os.environ["KUMA_URL"].rstrip("/")
 KUMA_USERNAME = os.environ["KUMA_USERNAME"]
 KUMA_PASSWORD = os.environ["KUMA_PASSWORD"]
+GIT_TOKEN = os.environ["GIT_TOKEN"]
 
 GIT_REPOS = [
-    # List your app repos to scan here
     "https://git.dvirlabs.com/dvirlabs/dev-tools.git",
     "https://git.dvirlabs.com/dvirlabs/infra.git",
     "https://git.dvirlabs.com/dvirlabs/observability-stack.git",
     "https://git.dvirlabs.com/dvirlabs/my-apps.git"
 ]
-GIT_TOKEN = os.environ["GIT_TOKEN"]
-
-def login_kuma():
-    session = requests.Session()
-    r = session.post(f"{KUMA_URL}/api/login", json={
-        "username": KUMA_USERNAME,
-        "password": KUMA_PASSWORD
-    })
-    r.raise_for_status()
-    return session
 
 def find_monitoring_files(clone_path):
-    result = []
-    for root, dirs, files in os.walk(clone_path):
+    for root, _, files in os.walk(clone_path):
         for file in files:
             if file == "monitoring.yaml":
-                result.append(os.path.join(root, file))
-    return result
+                yield os.path.join(root, file)
 
-def sync_monitors(session, yaml_path):
-    with open(yaml_path, "r") as f:
-        content = yaml.safe_load(f)
+def sync_monitor(api, path):
+    with open(path, "r") as f:
+        config = yaml.safe_load(f)
 
-    kuma = content.get("uptime_kuma")
-    if not kuma or not kuma.get("enabled"):
+    kuma_cfg = config.get("uptime_kuma")
+    if not kuma_cfg or not kuma_cfg.get("enabled"):
         return
 
-    payload = {
-        "type": kuma.get("type", "http"),
-        "name": kuma["name"],
-        "url": kuma["url"],
-        "interval": kuma.get("interval", 60),
-        "retryInterval": 60,
-        "maxretries": 3,
-        "method": "GET",
-        "upsideDown": kuma.get("upsideDown", False),
-        "tags": kuma.get("tag", "")
+    name = config.get("app") or os.path.basename(os.path.dirname(path))
+    url = kuma_cfg["url"]
+    tag_name = kuma_cfg.get("tag", "uncategorized")
+
+    print(f"🔄 Syncing monitor: {name}")
+
+    # Check if monitor already exists
+    for monitor in api.get_monitors():
+        if monitor["name"] == name:
+            print(f"⏭️  Monitor '{name}' already exists — skipping")
+            return
+
+    # Get or create tag safely
+    tag_id = None
+    for tag in api.get_tags():
+        if tag["name"] == tag_name:
+            tag_id = tag["id"]
+            break
+
+    if not tag_id:
+        tag_resp = api.add_tag(name=tag_name, color="#2196f3")
+        tag_id = tag_resp.get("tagID")
+        if not tag_id:
+            for tag in api.get_tags():
+                if tag["name"] == tag_name:
+                    tag_id = tag["id"]
+                    break
+    if not tag_id:
+        raise Exception(f"❌ Failed to create or find tag: {tag_name}")
+
+    # Prepare Basic Auth using Kuma credentials
+    auth_kwargs = {
+        "authMethod": AuthMethod.HTTP_BASIC,
+        "basic_auth_user": KUMA_USERNAME,
+        "basic_auth_pass": KUMA_PASSWORD,
     }
 
-    if "keyword" in kuma:
-        payload["keyword"] = kuma["keyword"]
+    # Add the monitor
+    resp = api.add_monitor(
+        type=MonitorType.HTTP,
+        name=name,
+        url=url,
+        interval=60,
+        retryInterval=30,
+        resendInterval=0,
+        maxretries=3,
+        timeout=30,
+        upsideDown=False,
+        ignoreTls=False,
+        maxredirects=10,
+        accepted_statuscodes=["200-299"],
+        expiryNotification=True,
+        method="GET",
+        **auth_kwargs
+    )
 
-    print(f"➡️  Creating/updating monitor: {payload['name']}")
-    r = session.post(f"{KUMA_URL}/api/monitor/add", json=payload)
-    if r.status_code != 200:
-        print(f"❌ Failed to add monitor {payload['name']}: {r.text}")
-    else:
-        print(f"✅ Monitor synced: {payload['name']}")
+    monitor_id = resp["monitorID"]
+    api.add_monitor_tag(tag_id=tag_id, monitor_id=monitor_id, value="")
+    print(f"✅ Synced monitor '{name}' with tag '{tag_name}'")
 
-def clone_repo(repo_url, dest):
-    subprocess.run(["git", "clone", "--depth=1", repo_url, dest], check=True)
+
+def clone_repo(url, dest):
+    print(f"📥 Cloning {url} into {dest}")
+    subprocess.run(["rm", "-rf", dest], check=True)
+    subprocess.run(["git", "clone", "--depth=1", url.replace("https://", f"https://{GIT_TOKEN}@"), dest], check=True)
 
 def main():
-    session = login_kuma()
-    for repo_url in GIT_REPOS:
-        name = repo_url.split("/")[-1].replace(".git", "")
-        dest = f"/tmp/repos/{name}"
-        clone_repo(repo_url.format(token=GIT_TOKEN), dest)
-        yamls = find_monitoring_files(dest)
-        for yml in yamls:
-            sync_monitors(session, yml)
+    api = UptimeKumaApi(KUMA_URL)
+    api.login(KUMA_USERNAME, KUMA_PASSWORD)
+
+    for repo in GIT_REPOS:
+        name = repo.split("/")[-1].replace(".git", "")
+        path = f"/tmp/repos/{name}"
+        clone_repo(repo, path)
+        for yml in find_monitoring_files(path):
+            sync_monitor(api, yml)
 
 if __name__ == "__main__":
     main()