Jenkinsfile

@@ -14,7 +14,7 @@ spec:
     kubernetes.io/arch: arm64
     node-role.kubernetes.io/worker: "true"
   imagePullSecrets:
-    - name: harbor-robot-pipeline
+    - name: harbor-bstein-robot
   containers:
     - name: dind
       image: docker:27-dind
@@ -49,7 +49,7 @@ spec:
         - name: harbor-config
           mountPath: /docker-config
     - name: tester
-      image: python:3.12-slim
+      image: registry.bstein.dev/bstein/ariadne-ci:py312
       command: ["cat"]
       tty: true
       volumeMounts:
@@ -61,11 +61,10 @@ spec:
     - name: docker-config-writable
       emptyDir: {}
     - name: dind-storage
-      persistentVolumeClaim:
-        claimName: jenkins-dind-cache
+      emptyDir: {}
     - name: harbor-config
       secret:
-        secretName: harbor-robot-pipeline
+        secretName: harbor-bstein-robot
         items:
           - key: .dockerconfigjson
             path: config.json

ariadne/services/firefly.py

@@ -649,7 +649,6 @@ class FireflyService:
                 counters.failures += 1
 
         summary = counters.summary()
-        summary_payload = summary.__dict__
         logger.info(
             "firefly user sync finished",
             extra={
@@ -661,7 +660,7 @@ class FireflyService:
                 "failures": summary.failures,
             },
         )
-        return {"status": counters.status(), "summary": summary_payload}
+        return {"status": counters.status(), "summary": summary}
 
 
 firefly = FireflyService()

ariadne/services/wger.py

@@ -606,7 +606,6 @@ class WgerService:
                 counters.failures += 1
 
         summary = counters.summary()
-        summary_payload = summary.__dict__
         logger.info(
             "wger user sync finished",
             extra={
@@ -618,7 +617,7 @@ class WgerService:
                 "failures": summary.failures,
             },
         )
-        return {"status": counters.status(), "summary": summary_payload}
+        return {"status": counters.status(), "summary": summary}
 
 
 wger = WgerService()

ariadne/settings.py

@@ -189,7 +189,6 @@ class Settings:
     k8s_api_timeout_sec: float
     vm_url: str
     cluster_state_vm_timeout_sec: float
-    alertmanager_url: str
 
     mailu_sync_cron: str
     nextcloud_sync_cron: str
@@ -470,7 +469,6 @@ class Settings:
                 "http://victoria-metrics-single-server.monitoring.svc.cluster.local:8428",
             ).rstrip("/"),
             "cluster_state_vm_timeout_sec": _env_float("ARIADNE_CLUSTER_STATE_VM_TIMEOUT_SEC", 5.0),
-            "alertmanager_url": _env("ARIADNE_ALERTMANAGER_URL", "").rstrip("/"),
             "cluster_state_cron": _env("ARIADNE_SCHEDULE_CLUSTER_STATE", "*/15 * * * *"),
             "cluster_state_keep": _env_int("ARIADNE_CLUSTER_STATE_KEEP", 168),
         }

tests/test_cluster_state.py

@@ -143,19 +143,6 @@ def test_collect_cluster_state(monkeypatch) -> None:
     assert snapshot["metrics"]["pod_mem_top"] == []
     assert snapshot["metrics"]["job_failures_24h"] == []
     assert snapshot["metrics"]["pvc_usage_top"] == []
-    assert snapshot["summary"]["counts"]["nodes_total"] == 5.0
-    assert snapshot["summary"]["counts"]["nodes_ready"] == 5.0
-    assert snapshot["summary"]["counts"]["pods_running"] == 5.0
-    assert snapshot["summary"]["top"]["namespace_pods"][0]["namespace"] == "media"
-    assert snapshot["summary"]["baseline_window"]
-    assert "workload_not_ready" in snapshot["summary"]["top"]
-    assert "pod_restarts" in snapshot["summary"]["top"]
-    assert "attention_ranked" in snapshot["summary"]
-    assert snapshot["summary"]["health_bullets"]
-    assert snapshot["summary"]["unknowns"] == []
-    assert snapshot["context"]["nodes"]
-    assert snapshot["context"]["namespaces"]
-    assert "baseline" in snapshot["context"]["nodes"][0]
     assert summary.nodes_total == 2
     assert summary.nodes_ready == 1
     assert summary.pods_running == 5.0