[checkmk-commits] 3837 FIX Fixed empty check if lnx_if info contains additional line

Module: check_mk Branch: master Commit: 7e3baef91d61dca4b8f4764781a2f9ee3936fa50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e3baef91d61dc… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Sep 14 10:23:00 2016 +0200 3837 FIX Fixed empty check if lnx_if info contains additional line The output of lnx_if check has been empty if the interface provides an additional line provided by CDP (Cisco Discovery Protocol). This is fixed now but not further handled at the moment and may be a feature in the future. --- .werks/3837 | 11 +++++++++++ ChangeLog | 1 + checks/lnx_if | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/.werks/3837 b/.werks/3837 new file mode 100644 index 0000000..34e2551 --- /dev/null +++ b/.werks/3837 @@ -0,0 +1,11 @@ +Title: Fixed empty check if lnx_if info contains additional line +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1473840897 +Class: fix + +The output of lnx_if check has been empty if the interface provides an additional line +provided by CDP (Cisco Discovery Protocol). This is fixed now but not further handled +at the moment and may be a feature in the future. diff --git a/ChangeLog b/ChangeLog index 5e6097e..4a0f6d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -386,6 +386,7 @@ * 3870 FIX: elphase.include: more robust against none type params * 3801 FIX: Fixed race condition with persisted data... * 3854 FIX: juniper_bgp_state: Fixed service descriptions in some cases... + * 3837 FIX: Fixed empty check if lnx_if info contains additional line... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/lnx_if b/checks/lnx_if index 814e7d1..17c90e1 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -79,6 +79,11 @@ def if_lnx_extract_nic_info(info): if line[0].startswith("[end_iplink]"): line = lines.next() break + # There some cases with an additional line. These are currently unused$ + # but need to be handled anyway. This particular line contains information$ + # provided by cisco about neighors (CDP)$ + if line[0].startswith("alias"):$ + continue # Each interface in this block is represented by two lines status_info = line link_info = lines.next() # currently unused