Skip to content

Commit bb91855

Browse files
committed
naming consistency
1 parent 53ae3ac commit bb91855

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

slurm/datadog_checks/slurm/check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def process_sdiag(self, output):
333333
last_cycle_epoch = int(match.group(1))
334334
now = int(time.time())
335335
diff = now - last_cycle_epoch
336-
self.gauge('sdiag.last_cycle_seconds_ago', diff, tags=self.tags)
336+
self.gauge('sdiag.backfill.last_cycle_seconds_ago', diff, tags=self.tags)
337337
except Exception as e:
338338
self.log.debug("Failed to parse last cycle epoch from line '%s': %s", line, e)
339339

slurm/datadog_checks/slurm/constants.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
'backfill.total_jobs_since_cycle_start': 'Total backfilled jobs (since last stats cycle start):',
149149
'backfill.total_heterogeneous_components': 'Total backfilled heterogeneous job components:',
150150
'backfill.total_cycles': 'Total cycles:',
151-
'backfill.last_cycle_when': 'Last cycle when:',
152151
'backfill.last_cycle': 'Last cycle:',
153152
'backfill.max_cycle': 'Max cycle:',
154153
'backfill.mean_cycle': 'Mean cycle:',

slurm/metadata.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ slurm.partition.nodes.count,gauge,,node,,Number of nodes in the partition.,1,slu
2626
slurm.sacct.enabled,gauge,,,,Shows whether we're collecting sacct metrics or not for this host.,1,slurm,slurm_sacct_enabled,,
2727
slurm.sacct.job.duration,gauge,,second,,Duration of the job in seconds.,1,slurm,slurm_sacct_job_duration,,
2828
slurm.sacct.job.info,gauge,,,,Information about the Slurm job in sacct.,1,slurm,slurm_sacct_job_info,,
29-
slurm.sacct.slurm_job_ave_disk_read,gauge,,byte,,Average number of bytes read from disk by a job or step.,1,slurm,slurm_sacct_slurm_job_avgdiskread,,
29+
slurm.sacct.slurm_job_ave_disk_read,gauge,,byte,,Average number of bytes read from disk by a job or step.,1,slurm,slurm_sacct_slurm_job_avgdiskread,,urm
3030
slurm.sacct.slurm_job_avgcpu,gauge,,second,,Average (system + user) CPU time of all tasks in job.,1,slurm,slurm_sacct_slurm_job_avgcpu,,
3131
slurm.sacct.slurm_job_avgrss,gauge,,byte,,Average resident set size of all tasks in job.,1,slurm,slurm_sacct_slurm_job_avgrss,,
3232
slurm.sacct.slurm_job_cputime,gauge,,second,,Time used (Elapsed time * CPU count) by a job or step in cpu-seconds.,1,slurm,slurm_sacct_slurm_job_cputime,,
@@ -63,7 +63,7 @@ slurm.sdiag.jobs_running,gauge,,job,,Number of jobs running since last reset.,1,
6363
slurm.sdiag.jobs_started,gauge,,job,,Number of jobs started since last reset.,1,slurm,slurm_sdiag_jobs_started,,
6464
slurm.sdiag.jobs_submitted,gauge,,job,,Number of jobs submitted since last reset.,1,slurm,slurm_sdiag_jobs_submitted,,
6565
slurm.sdiag.last_cycle,gauge,,microsecond,,Time in microseconds for last scheduling cycle.,1,slurm,slurm_sdiag_last_cycle,,
66-
slurm.sdiag.last_cycle_seconds_ago,gauge,,second,,Time in seconds since the last scheduling cycle.,1,slurm,slurm_sdiag_last_cycle_seconds_ago,,
66+
slurm.sdiag.backfill.last_cycle_seconds_ago,gauge,,second,,Time in seconds since the last scheduling cycle.,1,slurm,slurm_sdiag_backfill_last_cycle_seconds_ago,,
6767
slurm.sdiag.last_queue_length,gauge,,job,,Length of jobs pending queue.,1,slurm,slurm_sdiag_last_queue_length,,
6868
slurm.sdiag.max_cycle,gauge,,microsecond,,Maximum time in microseconds for any scheduling cycle since last reset.,1,slurm,slurm_sdiag_max_cycle,,
6969
slurm.sdiag.mean_cycle,gauge,,microsecond,,Mean time in microseconds for all scheduling cycles since last reset.,1,slurm,slurm_sdiag_mean_cycle,,

slurm/tests/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1351,7 +1351,7 @@ def mock_output(filename):
13511351
{'name': 'slurm.sdiag.backfill.queue_length_mean', 'value': 28, 'tags': []},
13521352
{'name': 'slurm.sdiag.backfill.mean_table_size', 'value': 29, 'tags': []},
13531353
{
1354-
'name': 'slurm.sdiag.last_cycle_seconds_ago',
1354+
'name': 'slurm.sdiag.backfill.last_cycle_seconds_ago',
13551355
'value': 1000,
13561356
'tags': [],
13571357
}, # mocked to be 1000 seconds in the test

0 commit comments

Comments
 (0)