[checkmk-commits] This fixes a crash like this:

Module: check_mk Branch: master Commit: 347d4b24a325d6f5af7212af8d45411bbe220c91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=347d4b24a325d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 15:01:33 2015 +0100 This fixes a crash like this: UnboundLocalError: local variable 'disk_read_bytes' referenced before assignment Conflicts: ChangeLog checks/winperf_phydisk --- .werks/2856 | 12 ++++++++++++ ChangeLog | 1 + checks/winperf_phydisk | 6 +++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/2856 b/.werks/2856 new file mode 100644 index 0000000..e0edfb3 --- /dev/null +++ b/.werks/2856 @@ -0,0 +1,12 @@ +Title: winperf_phydisk: Not discovering on clusters where disk perfcounters are missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449064692 + +This fixes a crash like this: + +UnboundLocalError: local variable 'disk_read_bytes' referenced before assignment diff --git a/ChangeLog b/ChangeLog index 8491810..ce5bc72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,7 @@ * 2853 FIX: cisco_asa_failover: Added support for CISCO PIX security devices * 2854 FIX: winperf_if: Assuming interfaces without status to be up * 2855 FIX: ibm_svc_mdiskgrp: Fixed crash when capacity of pool is 0 + * 2856 FIX: winperf_phydisk: Not discovering on clusters where disk perfcounters are missing... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index e2fd98b..cca658b 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -67,7 +67,11 @@ def winperf_phydisk_convert(info): # for now. # In case disk performance counters are not enabled, the agent sends # an almost empty section, where the second line is missing completely - if len(info) == 1: + def disk_perfcounters_disabled(info): + nodes = set([ l[0] for l in info ]) + return len(nodes) == len(info) + + if disk_perfcounters_disabled(info): return [] lines = iter(info)