old without prm

Author: memalhot

batchtools/br.py

@@ -220,7 +220,6 @@ def run(args: argparse.Namespace):
             oc.create(job_body)
             print(f"Job: {job_name} created successfully. Now checking pod...")
             if args.wait:
-                # log_job_output(job_name=job_name, wait=True, timeout=args.timeout)
                 result_phase, run_elapsed = log_job_output(
                     job_name=job_name, wait=True, timeout=args.timeout
                 )

batchtools/helpers.py

@@ -1,6 +1,5 @@
 import openshift_client as oc
 
-
 def is_logged_in() -> bool:
     try:
         oc.invoke("whoami")

batchtools/prom_metrics.py

@@ -2,10 +2,12 @@
 from typing import Optional
 from datetime import timezone
 from datetime import datetime
-
+import openshift_client as oc
+from prometheus_client import CollectorRegistry, Histogram, Counter, Gauge
+from prometheus_client import push_to_gateway, pushadd_to_gateway
 
 PROMETHEUS_PUSH_URL = 'http://localhost:8080/metrics'
-PROMETHEUS_INSTANCE = os.environ.get("PROMETHEUS_INSTANCE", socket.gethostname())
+PROMETHEUS_INSTANCE = oc.get_project_name()
 
 DEFAULT_BUCKETS = [1, 5, 10, 30, 60, 120, 300, 600, 1200, 1800, 3600]  # +Inf is implicit
 
@@ -48,7 +50,6 @@ def lbl(extra: Optional[dict[str, str]] = None) -> str:
     # +Inf bucket is always 1 for a single observation
     lines.append(f'{metric_base}_bucket{lbl({"le": "+Inf"})} 1')
 
-    # Sum and count
     # Use full precision float; Prometheus parser handles standard float format
     lines.append(f"{metric_base}_sum{lbl()} {elapsed}")
     lines.append(f"{metric_base}_count{lbl()} 1")