rasmus/blades-ssh-scraper
rasmus
/
blades-ssh-scraper
1
0
Fork 0
Code Issues 6 Pull Requests Activity

remove timestamps and move errors count to a seperate line

This commit is contained in:
rasmus 2020-12-23 10:26:34 +02:00
parent 9d46bb55da
commit 4442e0320a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
prom_servers.py
View File

@ -34,7 +34,6 @@ def prom_servers(PREFIX, baysInUseCount, servers):
promUID = []
promPower = []
errors = 0
timestampPart = ' [' + str(int(float(datetime.now().timestamp()) * 1000)) + ']' # https://github.com/prometheus/client_python/issues/185#issuecomment-671801202
for n in range(baysInUseCount):
if servers[n][2] == '': # If no serial
@ -44,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(servers[n][7]) + timestampPart )
promRelAC.append( PREFIX + 'blade_relative_ac' + labelsPart + str(float(servers[n][7])) )
promBldDC.append( PREFIX + 'blade_bladeonly_dc' + labelsPart + str(servers[n][6]) + timestampPart )
promBldDC.append( PREFIX + 'blade_bladeonly_dc' + labelsPart + str(float(servers[n][6])) )
if servers[n][3] == 'OK':
@ -59,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(health) + timestampPart )
promHealth.append( PREFIX + 'blade_health' + labelsPart + str(float(health)) )
if servers[n][5] == 'On':
@ -71,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(uid) + timestampPart )
promUID.append( PREFIX + 'blade_uid' + labelsPart + str(float(uid)) )
if servers[n][4] == 'On':
power = 1
@ -81,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(power) + timestampPart )
promPower.append( PREFIX + 'blade_power' + labelsPart + str(float(power)) )
#breakpoint()
# Add differnet types of things together.
@ -91,7 +90,8 @@ 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')
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', [PREFIX + 'errors ' + str(errors)], 'counter')
errors_prom = [PREFIX + 'errors{} ' + 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)
#breakpoint()