Module: check_mk
Branch: master
Commit: 83bad49a4e2a2474d744929a1ac6475454cc1c88
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83bad49a4e2a24…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Fri Jan 10 15:47:27 2014 +0100
Minor code cleanup
---
checks/job | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/checks/job b/checks/job
index 3a75bff..bf58809 100644
--- a/checks/job
+++ b/checks/job
@@ -26,6 +26,7 @@
#<<<job>>>
#==> asd ASD <==
+#start_time 1389355839
#exit_code 0
#real_time 0:00.00
#user_time 0.00
@@ -37,6 +38,7 @@
#
#
#==> test <==
+#start_time 1389352839
#exit_code 0
#real_time 0:00.00
#user_time 0.00
@@ -46,10 +48,13 @@
#max_res_kbytes 1984
#avg_mem_kbytes 0
-import datetime
-
def inventory_job(info):
- return [ (' '.join(l[1:-1]), None) for l in info if l[0] == '==>'
]
+ inventory = []
+ for line in info:
+ if line[0] == '==>':
+ item = ' '.join(line[1:-1])
+ inventory.append( (item, None) )
+ return inventory
def job_parse_real_time(s):
parts = s.split(':')
@@ -77,10 +82,8 @@ def job_parse(item, info):
val = job_parse_real_time(val)
elif key in [ 'user_time', 'system_time' ]:
val = float(val)
- elif key in [ 'exit_code', 'invol_context_switches',
'vol_context_switches' ]:
+ elif key in [ 'exit_code', 'invol_context_switches',
'vol_context_switches', 'start_time' ]:
val = int(val)
- elif key == 'start_time':
- val = datetime.datetime.fromtimestamp(int(val))
elif key in [ 'max_res_kbytes', 'avg_mem_kbytes' ]:
key = key.replace('kbytes', 'bytes')
val = int(val) * 1000
@@ -103,9 +106,8 @@ def check_job(item, _no_params, info):
txt += ' (!!)'
output.append(txt)
- output.append('Started: %s' %
job['start_time'].strftime('%Y-%m-%d %H:%M:%S'))
-
for key, title, value in [
+ ('start_time', 'Started',
job['start_time']),
('real_time', 'Real-Time',
job['real_time']),
('user_time', 'User-Time',
job['user_time']),
('system_time', 'System-Time',
job['system_time']),
@@ -120,6 +122,8 @@ def check_job(item, _no_params, info):
display_value = get_bytes_human_readable(value, 1000)
elif key in [ 'real_time', 'user_time', 'system_time' ]:
display_value = get_age_human_readable(value)
+ elif key == 'start_time':
+ display_value = time.strftime("%Y-%m-%d %H:%M:%S",
time.localtime(value) )
else:
display_value = value