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

Module: check_mk Branch: master Commit: 5b067aab1669f74568f714cd2a72acc251c9160f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b067aab1669f7… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Nov 8 22:34:13 2013 +0100 FIX veeam_jobs: check behaviour improved when backup is in progress --- .werks/66 | 8 ++++++++ ChangeLog | 1 + checkman/veeam_jobs | 3 ++- checks/veeam_jobs | 6 ++++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/66 b/.werks/66 new file mode 100644 index 0000000..842f528 --- /dev/null +++ b/.werks/66 @@ -0,0 +1,8 @@ +Title: veeam_jobs: check behaviour improved when backup is in progress +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1383946426 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 733fee5..439e2c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * 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 + * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/checkman/veeam_jobs b/checkman/veeam_jobs index e9121e3..fe1dbe2 100644 --- a/checkman/veeam_jobs +++ b/checkman/veeam_jobs @@ -10,7 +10,8 @@ description: comment section of the two Veeam agent plugin scripts on how to install the scripts. - This check is {OK} if the result of the backup is {Success}. + This check is {OK} if the result of the backup is {Success} or the state + of the backup is {Working}.. It is {CRIT} if the result of the backup is {Failed}. It is {UNKNOWN} in all other cases. diff --git a/checks/veeam_jobs b/checks/veeam_jobs index 491cef9..a64fcd9 100644 --- a/checks/veeam_jobs +++ b/checks/veeam_jobs @@ -24,17 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -state = { "Success": 0, "Failed": 2, "Warning":1, "InProgress":0, "Pending":0 } def inventory_veeam_jobs(info): return [ (x[0], None) for x in info ] - def check_veeam_jobs(item, params, info): for line in info: if line[0] == item: if line[3] == "Success": state = 0 + elif line[2] =="Working": + state = 0 + line.pop(7) + line.pop(6) elif line[3] == "Failed": state = 2 else: