naming consistency

Author: steveny91

slurm/datadog_checks/slurm/check.py

@@ -333,7 +333,7 @@ def process_sdiag(self, output):
                         last_cycle_epoch = int(match.group(1))
                         now = int(time.time())
                         diff = now - last_cycle_epoch
-                        self.gauge('sdiag.last_cycle_seconds_ago', diff, tags=self.tags)
+                        self.gauge('sdiag.backfill.last_cycle_seconds_ago', diff, tags=self.tags)
                 except Exception as e:
                     self.log.debug("Failed to parse last cycle epoch from line '%s': %s", line, e)
 

slurm/datadog_checks/slurm/constants.py

@@ -148,7 +148,6 @@
         'backfill.total_jobs_since_cycle_start': 'Total backfilled jobs (since last stats cycle start):',
         'backfill.total_heterogeneous_components': 'Total backfilled heterogeneous job components:',
         'backfill.total_cycles': 'Total cycles:',
-        'backfill.last_cycle_when': 'Last cycle when:',
         'backfill.last_cycle': 'Last cycle:',
         'backfill.max_cycle': 'Max cycle:',
         'backfill.mean_cycle': 'Mean cycle:',

slurm/metadata.csv

@@ -26,7 +26,7 @@ slurm.partition.nodes.count,gauge,,node,,Number of nodes in the partition.,1,slu
 slurm.sacct.enabled,gauge,,,,Shows whether we're collecting sacct metrics or not for this host.,1,slurm,slurm_sacct_enabled,,
 slurm.sacct.job.duration,gauge,,second,,Duration of the job in seconds.,1,slurm,slurm_sacct_job_duration,,
 slurm.sacct.job.info,gauge,,,,Information about the Slurm job in sacct.,1,slurm,slurm_sacct_job_info,,
-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,,
+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
 slurm.sacct.slurm_job_avgcpu,gauge,,second,,Average (system + user) CPU time of all tasks in job.,1,slurm,slurm_sacct_slurm_job_avgcpu,,
 slurm.sacct.slurm_job_avgrss,gauge,,byte,,Average resident set size of all tasks in job.,1,slurm,slurm_sacct_slurm_job_avgrss,,
 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,
 slurm.sdiag.jobs_started,gauge,,job,,Number of jobs started since last reset.,1,slurm,slurm_sdiag_jobs_started,,
 slurm.sdiag.jobs_submitted,gauge,,job,,Number of jobs submitted since last reset.,1,slurm,slurm_sdiag_jobs_submitted,,
 slurm.sdiag.last_cycle,gauge,,microsecond,,Time in microseconds for last scheduling cycle.,1,slurm,slurm_sdiag_last_cycle,,
-slurm.sdiag.last_cycle_seconds_ago,gauge,,second,,Time in seconds since the last scheduling cycle.,1,slurm,slurm_sdiag_last_cycle_seconds_ago,,
+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,,
 slurm.sdiag.last_queue_length,gauge,,job,,Length of jobs pending queue.,1,slurm,slurm_sdiag_last_queue_length,,
 slurm.sdiag.max_cycle,gauge,,microsecond,,Maximum time in microseconds for any scheduling cycle since last reset.,1,slurm,slurm_sdiag_max_cycle,,
 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

@@ -1351,7 +1351,7 @@ def mock_output(filename):
         {'name': 'slurm.sdiag.backfill.queue_length_mean', 'value': 28, 'tags': []},
         {'name': 'slurm.sdiag.backfill.mean_table_size', 'value': 29, 'tags': []},
         {
-            'name': 'slurm.sdiag.last_cycle_seconds_ago',
+            'name': 'slurm.sdiag.backfill.last_cycle_seconds_ago',
             'value': 1000,
             'tags': [],
         },  # mocked to be 1000 seconds in the test