[checkmk-commits] The grouping of interfaces which are checked with the if64 check

Module: check_mk Branch: master Commit: 4c95e8212a599a868ce6319c61b43a32760085f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c95e8212a599a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 6 14:31:16 2015 +0100 The grouping of interfaces which are checked with the if64 check was broken. This has been fixed now. Grouping of interfaces across cluster nodes is undefined behaviour. Added an error message to inform the users in case they configured grouping for clustered interfaces. Conflicts: checks/if.include --- .werks/2730 | 15 +++++++++++++++ ChangeLog | 1 + checks/if.include | 10 +++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/2730 b/.werks/2730 new file mode 100644 index 0000000..ef8869d --- /dev/null +++ b/.werks/2730 @@ -0,0 +1,15 @@ +Title: if64: Grouping of interfaces resulted in an exception +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446816126 + +The grouping of interfaces which are checked with the if64 check +was broken. This has been fixed now. + +Grouping of interfaces across cluster nodes is undefined behaviour. +Added an error message to inform the users in case they configured +grouping for clustered interfaces. diff --git a/ChangeLog b/ChangeLog index d09590c..6c3837b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * 2725 FIX: Dynamic levels: Enforce config of levels for filesystems larger than 0 bytes... * 2726 FIX: veeam_backup_status: Fixed missing agent section error in case of aborted tasks * 2727 FIX: ibm_imm_health: Fixed unhandled exception when SNMP info is missing + * 2730 FIX: if64: Grouping of interfaces resulted in an exception... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/if.include b/checks/if.include index 87422f2..d3bc4e1 100644 --- a/checks/if.include +++ b/checks/if.include @@ -420,6 +420,9 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou else: ifOperStatusName = if_statename(ifOperStatus) + if has_nodeinfo and node: + return 3, "Interface grouping is not supported for clusters." + ifGroup = None if type(ifIndex) == tuple: ifGroup, ifIndex = ifIndex @@ -487,7 +490,12 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou if params.get("include_items"): alias_info.append("grouped items") - group_entry = [ + if has_nodeinfo: + group_entry = [None] + else: + group_entry = [] + + group_entry += [ "ifgroup%s" % item, # ifIndex item, # ifDescr params["iftype"], # ifType