Module: check_mk Branch: master Commit: 80717a1631bb8791ac32cf9141d79a099811ffef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80717a1631bb87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 17:21:03 2016 +0100 3317 FIX lnx_bonding: handle bogus output of 1.2.6 agents where >/dev/null is missing after popd --- .werks/3317 | 10 ++++++++++ ChangeLog | 1 + checks/lnx_bonding | 7 ++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/3317 b/.werks/3317 new file mode 100644 index 0000000..c46b4ba --- /dev/null +++ b/.werks/3317 @@ -0,0 +1,10 @@ +Title: lnx_bonding: handle bogus output of 1.2.6 agents where >/dev/null is missing after popd +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458577244 + + diff --git a/ChangeLog b/ChangeLog index e817f01..cb2e3b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ * 3300 FIX: zfsget: Fixed excluding snapshots from zfsget section * 3301 FIX: mrpe: Fixed exception "urllib not defined" when using Nagios as core * 3333 FIX: Predictive levels: Improved error handling in case no RRDs have been created yet + * 3317 FIX: lnx_bonding: handle bogus output of 1.2.6 agents where >/dev/null is missing after popd Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/lnx_bonding b/checks/lnx_bonding index ffdfa86..810aadf 100644 --- a/checks/lnx_bonding +++ b/checks/lnx_bonding @@ -56,7 +56,12 @@ # Permanent HW addr: 00:26:b9:7d:89:2e def parse_lnx_bonding(info): - lines = iter(info) + def strip_popd_garbage(info): + for line in info: + if len(line) != 1 or not line[0].startswith("/"): + yield line + + lines = strip_popd_garbage(info) bonds = {} # Skip header with bonding version