Skip to content

Prometheus export fixes #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 30, 2024
Merged

Prometheus export fixes #28

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a349113
fix walltime calculation
alemsh Jan 29, 2024
ea9cb30
Merge remote-tracking branch 'origin/master' into prometheus_export_f…
alemsh Jan 29, 2024
ea4ce2a
fix datetime parsing and difference
alemsh Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions condor_queue_to_prometheus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3


import os
import glob
from optparse import OptionParser
Expand All @@ -11,15 +10,16 @@
import prometheus_client
from condor_metrics import *
from itertools import chain

from datetime import datetime
from dateutil import parser as dateparser
def get_job_state(ad):
jobstatus = None

if ad["LastJobStatus"] == 1:
if ad["JobStatus"] == 1:
jobstatus = 'Idle'
elif ad["LastJobStatus"] == 2:
elif ad["JobStatus"] == 2:
jobstatus = 'Running'
elif ad["LastJobStatus"] == 5:
elif ad["JobStatus"] == 5:
jobstatus = 'Held'

return jobstatus
Expand All @@ -31,6 +31,7 @@ def generate_ads(entries):

def compose_ad_metrics(ads):
for ad in ads:
walltime = int(ad['RequestCpus']) * (datetime.utcnow() - dateparser.parse(ad['JobCurrentStartDate'])).total_seconds()
labels = {key: None for key in metrics.labels}

labels['schedd'] = ad['GlobalJobId'].split('#')[0]
Expand All @@ -54,8 +55,8 @@ def compose_ad_metrics(ads):
metrics.condor_jobs_disk_usage_bytes.labels(**labels).inc(ad['DiskUsage_RAW']*1024)
metrics.condor_jobs_memory_request_bytes.labels(**labels).inc(ad['RequestMemory']*1024*1024)
metrics.condor_jobs_memory_usage_bytes.labels(**labels).inc(ad['ResidentSetSize_RAW']*1024)
metrics.condor_jobs_walltime.labels(**labels).inc(ad['walltimehrs']*3600)
metrics.condor_jobs_wastetime.labels(**labels).inc((ad['walltimehrs']*3600)-ad['RemoteUserCpu'])
metrics.condor_jobs_walltime.labels(**labels).inc(walltime)
metrics.condor_jobs_wastetime.labels(**labels).inc(walltime - ad['RemoteUserCpu'])

if 'RequestGpus' in ad:
metrics.condor_jobs_gpu_request.labels(**labels).inc(ad['RequestGpus'])
Expand Down Expand Up @@ -97,6 +98,7 @@ def compose_ad_metrics(ads):
failed = e
logging.error('Condor error', exc_info=True)
gen = chain(*gens)
metrics.clear()
compose_ad_metrics(generate_ads(gen))
delta = time.time() - start

Expand Down