Module: check_mk Branch: master Commit: a0ed7c25a7785027c443c73bdfd62edc9aecd33a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0ed7c25a77850… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 22 15:11:45 2017 +0200 Revert "5112 FIX if.include: Fixed wrong handling of duplicate interfaces if 'use alias' or 'use desccription' is configured" This reverts commit 3254092ff6feefbd511c50c87d0dd3f0b6613651. --- .werks/5112 | 19 ------------------- checks/if.include | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.werks/5112 b/.werks/5112 deleted file mode 100644 index 4c20abf..0000000 --- a/.werks/5112 +++ /dev/null @@ -1,19 +0,0 @@ -Title: if.include: Fixed wrong handling of duplicate interfaces if "use alias" or "use desccription" is configured -Level: 1 -Component: checks -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.5.0i1 -Date: 1502973584 - -Within the rule {{Network Interface and Switch Port Discovery}} -you are able to configure the service description to use the -interface alias or description. Per default the index is used. -If there are duplicate interfaces with same name, the interface -index should be added. - - -Unfortunately, the afore-mentioned mechanism was broken. This -has been fixed. diff --git a/checks/if.include b/checks/if.include index a5d012c..d606a50 100644 --- a/checks/if.include +++ b/checks/if.include @@ -417,7 +417,7 @@ def inventory_if_common(info, has_nodeinfo = False): # Prepare single interfaces if not is_only_in_group: - if item in global_seen: + if ifIndex in global_seen: continue if item in seen_items: # duplicate