[checkmk-commits] Check_MK Git: check_mk: FIX veeam_client: check behaviour improved when backup is in progress

Module: check_mk Branch: master Commit: d4d9c1a3f22a57ac348faa14b67d647d008bfb62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4d9c1a3f22a57… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Nov 8 22:33:13 2013 +0100 FIX veeam_client: check behaviour improved when backup is in progress --- .werks/65 | 8 ++++++++ ChangeLog | 3 ++- checkman/veeam_client | 3 ++- checks/veeam_client | 7 +++++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/65 b/.werks/65 new file mode 100644 index 0000000..cc554a8 --- /dev/null +++ b/.werks/65 @@ -0,0 +1,8 @@ +Title: veeam_client: check behaviour improved when backup is in progress +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1383946322 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 83964bd..733fee5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 0080 Added new checks for Brocade NetIron MLX switching / routing devices... * 0091 apc_ats_output: new check for output measurements on APC ATS devices * 0024 FIX: cisco_wlc: removed configuration parameter ap_model + * 0065 FIX: veeam_client: check behaviour improved when backup is in progress Multisite: * 0001 New filters for selecting several host/service-groups at once... @@ -21,7 +22,7 @@ WATO: * 0053 New rule for configuring the display_name of a service... - * 0048 FIX: Fixed locking issue on host diagnose page... + * 0048 FIX: Fixed locking issue on host diagnose page Reporting & Availability: * 0051 Option for showing timeline directly in availability table... diff --git a/checkman/veeam_client b/checkman/veeam_client index e7d54cb..83ce3fb 100644 --- a/checkman/veeam_client +++ b/checkman/veeam_client @@ -23,4 +23,5 @@ inventory: perfdata: Total Size, duration and the average speed of the backup will be recorded - as performance data. + as performance data. Duration will not be recorded if the status of the backup + is {Pending} or {InProgress}. diff --git a/checks/veeam_client b/checks/veeam_client index 3513189..2b11b8f 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -43,7 +43,7 @@ def check_veeam_client(item, params, info): if line[0] == "Status": result = line[1] infotxt += line[0] + ":" + line[1] + " " - elif line[0] == "DurationDDHHMMSS": + elif line[0] == "DurationDDHHMMSS" and result != "InProgress" and result != "Pending": duration_string = line[1] spur = map(saveint, duration_string.split(":") ) if len(spur) == 4: @@ -58,7 +58,10 @@ def check_veeam_client(item, params, info): totalsize = saveint(line[1]) perfdata.append(("totalsize", totalsize, 0, 0, 0)) else: - infotxt += line[0] + ":" + line[1] + " " + if (result == "InProgress" or result == "Pending") and line[0] == "StopTime": + infotxt += line[0] + ": - " + else: + infotxt += line[0] + ":" + line[1] + " " return (state[result], infotxt, perfdata)