Module: check_mk
Branch: master
Commit: 18c1d3c97eb23e366d3147dfc622944072172f49
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18c1d3c97eb23e…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Oct 23 15:35:08 2014 +0200
veeam_client: Changed check output
---
checks/veeam_client | 26 +++++++++++++++++++++-----
modules/check_mk_base.py | 4 ++--
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/checks/veeam_client b/checks/veeam_client
index 07a194f..d86df58 100644
--- a/checks/veeam_client
+++ b/checks/veeam_client
@@ -51,11 +51,30 @@ def check_veeam_client(item, params, info):
# Only output the Job name
infotexts.append("Job: %s" % data['JobName'] )
+
+
+ size_info = []
+ size_legend = []
+
+ TotalSizeByte = int(data['TotalSizeByte'])
+ perfdata.append(('totalsize', TotalSizeByte))
+ size_info.append(get_bytes_human_readable(TotalSizeByte))
+ size_legend.append("total")
+
# Output ReadSize and TransferedSize if available
if "ReadSizeByte" in data:
- infotexts.append("Read Size: %s" %
get_bytes_human_readable(int(data['ReadSizeByte'])))
+ ReadSizeByte = int(data['ReadSizeByte'])
+ perfdata.append(('readsize', ReadSizeByte))
+ size_info.append(get_bytes_human_readable(ReadSizeByte))
+ size_legend.append("read")
+
if "TransferedSizeByte" in data:
- infotexts.append("Transferred Size: %s" %
get_bytes_human_readable(int(data['TransferedSizeByte'])))
+ TransferedSizeByte = int(data['TransferedSizeByte'])
+ perfdata.append(('transferredsize', TransferedSizeByte))
+ size_info.append(get_bytes_human_readable(TransferedSizeByte))
+ size_legend.append("transferred")
+
+ infotexts.append("Size (%s): %s" % ("/".join(size_legend),
"/ ".join(size_info)))
# Check Stop time in any case, that we can catch hanging backups
if "StopTime" not in data:
@@ -95,9 +114,6 @@ def check_veeam_client(item, params, info):
perfdata.append(('avgspeed', AvgSpeedBps))
infotexts.append(("Average Speed: %s/s" %
get_bytes_human_readable(AvgSpeedBps)))
- TotalSizeByte = int(data['TotalSizeByte'])
- perfdata.append(('totalsize', TotalSizeByte))
- infotexts.append(("Total Size: %s" %
get_bytes_human_readable(TotalSizeByte)))
return state, ", ".join(infotexts), perfdata
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 4e697f2..795c989 100644
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -1793,12 +1793,12 @@ def get_age_human_readable(secs):
return "%d min" % mins
hours, mins = divmod(mins, 60)
if hours < 12 and mins > 0:
- return "%d hours, %d min" % (hours, mins)
+ return "%d hours %d min" % (hours, mins)
elif hours < 48:
return "%d hours" % hours
days, hours = divmod(hours, 24)
if days < 7 and hours > 0:
- return "%d days, %d hours" % (days, hours)
+ return "%d days %d hours" % (days, hours)
return "%d days" % days
# Quote string for use as arguments on the shell