From f034197eca644e795804451725e917bb9e3e3667 Mon Sep 17 00:00:00 2001 From: rasmus Date: Wed, 23 Dec 2020 10:29:08 +0200 Subject: [PATCH] add units to names --- prom_servers.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/prom_servers.py b/prom_servers.py index 713e013..f8544b5 100644 --- a/prom_servers.py +++ b/prom_servers.py @@ -43,10 +43,10 @@ def prom_servers(PREFIX, baysInUseCount, servers): labelsPart = '{' + 'enc="' + servers[n][8] + '",' + 'bay="' + str(servers[n][0]) + '",' 'name="' + servers[n][1] + '",' + 'blade_serial="' + servers[n][2] + '"' + '} ' - promRelAC.append( PREFIX + 'blade_relative_ac' + labelsPart + str(float(servers[n][7])) ) + promRelAC.append( PREFIX + 'blade_relative_ac_watts' + labelsPart + str(float(servers[n][7])) ) - promBldDC.append( PREFIX + 'blade_bladeonly_dc' + labelsPart + str(float(servers[n][6])) ) + promBldDC.append( PREFIX + 'blade_bladeonly_dc_watts' + labelsPart + str(float(servers[n][6])) ) if servers[n][3] == 'OK': @@ -58,7 +58,7 @@ def prom_servers(PREFIX, baysInUseCount, servers): warn("unknown health on blade '" + servers[n][1] + "' in enc " + servers[n][8] + " bay " + str(servers[n][0]) + "." ) errors += 1 - promHealth.append( PREFIX + 'blade_health' + labelsPart + str(float(health)) ) + promHealth.append( PREFIX + 'blade_health_state' + labelsPart + str(float(health)) ) if servers[n][5] == 'On': @@ -70,7 +70,7 @@ def prom_servers(PREFIX, baysInUseCount, servers): warn("unknown UID status for blade '" + servers[n][1] + "' in enc " + servers[n][8] + " bay " + str(servers[n][0]) + "." ) errors += 1 - promUID.append( PREFIX + 'blade_uid' + labelsPart + str(float(uid)) ) + promUID.append( PREFIX + 'blade_uid_state' + labelsPart + str(float(uid)) ) if servers[n][4] == 'On': power = 1 @@ -80,7 +80,7 @@ def prom_servers(PREFIX, baysInUseCount, servers): power = 'NaN' warn("unknown power state for blade '" + servers[n][1] + "' in enc " + servers[n][8] + " bay " + str(servers[n][0]) + "." ) errors += 1 - promPower.append( PREFIX + 'blade_power' + labelsPart + str(float(power)) ) + promPower.append( PREFIX + 'blade_power_state' + labelsPart + str(float(power)) ) #breakpoint() # Add differnet types of things together. @@ -90,7 +90,7 @@ def prom_servers(PREFIX, baysInUseCount, servers): prom_disp_servers = prom_disp_servers + prom_header('Blade health 1 for ok 0 for nok NaN for err', promHealth, 'gauge') prom_disp_servers = prom_disp_servers + prom_header('Blade UID blinkyboy 1 for blinky blinky 0 for no blinky blinky NaN for err', promUID, 'gauge') prom_disp_servers = prom_disp_servers + prom_header('Blade power 1 for on and everything in between 0 for off NaN for err', promPower, 'gauge') - errors_prom = [PREFIX + 'errors{} ' + str(float(errors))] + errors_prom = [PREFIX + 'errors_total{} ' + str(float(errors))] prom_disp_servers = prom_disp_servers + prom_header('Number of errors or warnings encountered during the gathering of data see logs of promServers in blade-ssh-scraper', errors_prom, 'counter') #prom_disp_servers = '\n'.join(prom_disp_servers)