[checkmk-commits] Check_MK Git: check_mk: #1221 FIX veeam_client: Multisite perfometer is now more robust

Module: check_mk Branch: master Commit: 98ee74e35d0c6c32b8a59c703de883262ec3d303 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98ee74e35d0c6c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 2 15:19:09 2015 +0100 #1221 FIX veeam_client: Multisite perfometer is now more robust --- .werks/1221 | 10 ++++++++++ ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 7 +++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/1221 b/.werks/1221 new file mode 100644 index 0000000..c1a1590 --- /dev/null +++ b/.werks/1221 @@ -0,0 +1,10 @@ +Title: veeam_client: Multisite perfometer is now more robust +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422886659 + + diff --git a/ChangeLog b/ChangeLog index 6ca25b2..e437f8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -166,6 +166,7 @@ * 1884 FIX: Fixed exception in virtual host tree snapin * 1885 FIX: Fixed filtering by software versions in software package search * 1972 FIX: Prevent erasing of quicksearch field when sidebar is reloaded (e.g. during activate changes)... + * 1221 FIX: veeam_client: Multisite perfometer is now more robust WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 79f5ca2..f762470 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1204,8 +1204,11 @@ def perfometer_docsis_snr(row, check_command, perf_data): perfometers["check_mk-docsis_channels_upstream"] = perfometer_docsis_snr def perfometer_veeam_client(row, check_command, perf_data): - avgspeed_bytes = int(perf_data[4][1]) - duration_secs = int(perf_data[3][1]) + for graph in perf_data: + if graph[0] == "avgspeed": + avgspeed_bytes = int(graph[1]) + if graph[0] == "duration": + duration_secs = int(graph[1]) h = perfometer_logarithmic_dual_independent(avgspeed_bytes, '#54b948', 10000000, 2, duration_secs, '#2098cb', 500, 2) avgspeed = bytes_human_readable(avgspeed_bytes)