Module: check_mk Branch: master Commit: 4f9081911f9b59728ca54a67770c27bed87b2c22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9081911f9b59… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Dec 2 14:07:05 2014 +0100 #1584 FIX winperf_if: Fixed checks of interfaces with equal names but one with index When having interfaces with nearly equal names, where the only difference is that one has an index number as extension and the other has none, the check could not get the correct information during checking. Example: Intel[R] 82576 Gigabit Dual Port Network Connection 2 Intel[R] 82576 Gigabit Dual Port Network Connection --- .bugs/1065 | 7 +++++-- .bugs/1088 | 7 +++++-- .bugs/842 | 6 +++--- .bugs/845 | 23 +++++++++++++---------- .werks/1584 | 14 ++++++++++++++ ChangeLog | 1 + checks/winperf_if | 2 +- 7 files changed, 42 insertions(+), 18 deletions(-) diff --git a/.bugs/1065 b/.bugs/1065 index c27611d..d216413 100644 --- a/.bugs/1065 +++ b/.bugs/1065 @@ -1,9 +1,9 @@ Title: objects.precache missing on first start Component: core -State: open +Class: bug +State: works4me Date: 2014-03-24 13:28:13 Targetversion: 1.2.5i1 -Class: bug creating a new site with omd create blubb @@ -25,3 +25,6 @@ Error: Cannot open config file '/omd/sites/blubb/var/nagios/objects.precache' fo after a cmk -R nagios starts... :-( + +2014-12-02 12:35:57: changed state open -> works4me +Unable to reproduce this problem. diff --git a/.bugs/1088 b/.bugs/1088 index 401d001..2bb5121 100644 --- a/.bugs/1088 +++ b/.bugs/1088 @@ -1,9 +1,12 @@ Title: Keepalive mode adds multiple --keepalive-fd=__ as time goes by Component: core -State: open +Class: nastiness +State: done Date: 2014-01-24 16:57:53 Targetversion: 1.2.5i1 -Class: nastiness It seems that after each config reload one --keepalive-fd=7 is added to the command line. The Check_MK should remove this option when adding new one. + +2014-12-02 12:38:01: changed state open -> done +Is already fixed. diff --git a/.bugs/842 b/.bugs/842 index 52d4d2e..d47079d 100644 --- a/.bugs/842 +++ b/.bugs/842 @@ -1,9 +1,9 @@ -Title: HW/SW Inventory should not be appear on Clusters or some Special Agents -Component: inv +Title: Make host class (ALL_HOSTS, PHYSICAL_HOSTS, CLUSTER_HOSTS) available in WATO conditions +Component: wato State: open Date: 2014-04-16 09:35:42 Targetversion: 1.2.5i1 -Class: bug +Class: feature In Wato there is no option like PHYSICAL_HOSTS or CLUSTER_HOSTS so there should be a easy way to deactivate the HW/SW Inventory check using Wato for clusters. If you have a big enviroment it is not fine solution to click through a couple of folders to find all clusters an add a Cluster Tag. diff --git a/.bugs/845 b/.bugs/845 index 086c492..b269c44 100644 --- a/.bugs/845 +++ b/.bugs/845 @@ -1,21 +1,18 @@ Title: Interface Check: In some cases the check use information of the wrong interface Component: checks -State: open +Class: bug +State: done Date: 2014-11-21 14:45:22 Targetversion: 1.2.5i1 -Class: bug -In some cases the condition in check_if_common who trys to find the right item matchs to early if there two interfaces have the same -name, but in one case with a number an in the other without but with the same interace index. See the following agent output: +In some cases the condition in check_if_common who trys to find the right item +matchs to early if there two interfaces have the same name, but in one case +with a number and in the other without but with the same interface index. +See the following agent output: <<<winperf_if>>> 1416471728.39 510 -6 instances: Intel[R]_82576_Gigabit_Dual_Port_Network_Connection Intel -[R]_82576_Gigabit_Dual_Port_Network_Connection__2 Intel[R]_PRO_ -1000_PT_Dual_Port_Server_Adapter Intel -[R]_PRO_1000_PT_Dual_Port_Server_Adapter__2 -isatap.{76FCB5A2-8B81-4EC1-A917-7BB6004938B9} 6TO4_ -Adapter +6 instances: Intel[R]_82576_Gigabit_Dual_Port_Network_Connection Intel[R]_82576_Gigabit_Dual_Port_Network_Connection__2 Intel[R]_PRO_1000_PT_Dual_Port_Server_Adapter Intel[R]_PRO_1000_PT_Dual_Port_Server_Adapter__2 isatap.{76FCB5A2-8B81-4EC1-A917-7BB6004938B9} 6TO4_Adapter -122 3152470526 0 0 0 0 3209053651 bulk_count -110 90473997 0 0 0 0 46660432 bulk_count -244 72853543 0 0 0 0 35395085 bulk_count @@ -34,3 +31,9 @@ Adapter 32 0 0 0 0 0 0 large_rawcount 34 0 0 0 0 0 0 large_rawcount 1086 0 0 0 0 0 0 large_rawcount + +Intel[R] 82576 Gigabit Dual Port Network Connection 2 +Intel[R] 82576 Gigabit Dual Port Network Connection + +2014-12-02 14:04:52: changed state open -> done +Fixed by changing internal sorting of interfaces in winperf_if check diff --git a/.werks/1584 b/.werks/1584 new file mode 100644 index 0000000..4bc970a --- /dev/null +++ b/.werks/1584 @@ -0,0 +1,14 @@ +Title: winperf_if: Fixed checks of interfaces with equal names but one with index +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417525531 +Class: fix + +When having interfaces with nearly equal names, where the only difference is that +one has an index number as extension and the other has none, the check could not +get the correct information during checking. Example: + +Intel[R] 82576 Gigabit Dual Port Network Connection 2 +Intel[R] 82576 Gigabit Dual Port Network Connection diff --git a/ChangeLog b/ChangeLog index 46bac54..ba88009 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * 1550 FIX: zfs_arc_cache: do not inventorize of no cache information available... * 1572 FIX: Sample configs, plugins etc. for windows agent use windows linebreaks now... * 1575 FIX: vSphere Monitoring works with RedHat 5.x now... + * 1584 FIX: winperf_if: Fixed checks of interfaces with equal names but one with index... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/winperf_if b/checks/winperf_if index 03438c8..33d7117 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -152,7 +152,7 @@ def convert_winperf_if(info): # Sort NIC names are create artifical index nic_names = nics.keys() - nic_names.sort() + nic_names.sort(reverse=True) for nr, nic_name in enumerate(nic_names): nic = nics[nic_name]