use a unique name for prometheus to aggregate

metrics

Author: memalhot

batchtools/br.py

@@ -221,10 +221,9 @@ def run(args: argparse.Namespace):
 
                 IN_PROGRESS.labels(**labels, result=result_phase).dec()
 
-                # 👇 Create a grouping key unique to this job run
                 group = {
                     "instance": PROMETHEUS_INSTANCE,  # e.g. "ope-test"
-                    "job_name": "job",             # e.g. "job-none-b799d46a6f995a9d8d58b6aff76abefc"
+                    "job_name": job_name            # e.g. "job-none-b799d46a6f995a9d8d58b6aff76abefc"
                 }
 
                 push_registry_text(grouping_key=group)

batchtools/prom_metrics.py

@@ -13,7 +13,7 @@
     Gauge,
     generate_latest,
     CONTENT_TYPE_LATEST,
-    pushadd_to_gateway,   # <-- add this
+    pushadd_to_gateway,
 )
 
 LONG_JOB_BUCKETS = (1, 2, 5, 10, 20, 30, 60, 120, 180, 300, 600, 900, float("inf"))
@@ -141,8 +141,6 @@ def generate_metrics_text() -> tuple[str, str]:
     payload = generate_latest(registry)
     return payload.decode("utf-8"), CONTENT_TYPE_LATEST
 
-from prometheus_client import pushadd_to_gateway, delete_from_gateway  # add delete if you want cleanup
-
 def push_registry_text(grouping_key: dict[str, str] | None = None) -> None:
     if not PUSHGATEWAY_ADDR:
         body, _ = generate_metrics_text()