Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: fixed encoding bug even better

by Andreas Boesl

Module: check_mk Branch: master Commit: 0af69dc0db797d7d788afb6f83a23a2eadef757d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0af69dc0db797d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 4 09:47:41 2015 +0100 fixed encoding bug even better --- web/htdocs/htmllib.py | 4 +++- web/plugins/sidebar/wato.py | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e4dbbb3..d70fcc7 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1069,8 +1069,10 @@ class html: def var_utf8(self, varname, deflt = None): val = self.vars.get(varname, deflt) - if val != None: + if val != None and type(val) != unicode: return val.decode("utf-8") + else: + return val # Return all values of a variable that possible occurs more # than once in the URL. note: self.listvars does contain those diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 67ecc45..cb3adfc 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -227,8 +227,6 @@ def render_wato_foldertree(): # Render link target selection # selected_topic, selected_target = config.load_user_file("foldertree", (_('Hosts'), 'allhosts')) - if type(selected_topic) == unicode: - selected_topic = selected_topic.encode("utf-8") views.load_views() dashboard.load_dashboards()

9 years, 6 months

Check_MK Git: check_mk: Updated bug entries #2172

by Andreas Boesl

Module: check_mk Branch: master Commit: c129aaaca77bd5a8656ff94c3273a014c1992c9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c129aaaca77bd5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 4 09:46:36 2015 +0100 Updated bug entries #2172 --- .bugs/2172 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2172 b/.bugs/2172 new file mode 100644 index 0000000..02887fb --- /dev/null +++ b/.bugs/2172 @@ -0,0 +1,10 @@ +Title: load_user_file/save_user_file should handle encoding correctly +Component: multisite +State: open +Date: 2015-03-04 09:42:59 +Targetversion: 1.2.7 +Class: bug + +Currently in all saved userfiles unicode strings are converted to utf-8 encoding ascii strings. +These strings are not converted back to unicode strings during load_user_file(..). +All strings with umlauts need to be unicode strings within multisite code.

9 years, 6 months

Check_MK Git: check_mk: #2088 FIX cisco_cpu: Dealing with non CPU utilization information correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: bd4d85bf48692811975fcafc3469dba84252e42c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd4d85bf486928… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 4 08:37:35 2015 +0100 #2088 FIX cisco_cpu: Dealing with non CPU utilization information correctly The check resulted in an exception when the host could be contacted via SNMP, but the host did not provide a value for the CPU utilization. --- .werks/2088 | 11 +++++++++++ ChangeLog | 1 + checks/cisco_cpu | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/2088 b/.werks/2088 new file mode 100644 index 0000000..3ed81c2 --- /dev/null +++ b/.werks/2088 @@ -0,0 +1,11 @@ +Title: cisco_cpu: Dealing with non CPU utilization information correctly +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425454581 + +The check resulted in an exception when the host could be contacted +via SNMP, but the host did not provide a value for the CPU utilization. diff --git a/ChangeLog b/ChangeLog index c17ee8f..9f1ba8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -223,6 +223,7 @@ * 2086 FIX: apc_ats_status: Fixed exception when source different than selected source * 2087 FIX: netapp_api_temp: Fixed exception when dealing with old discovered checks... * 2051 FIX: windows agent: no longer outputs stderr of local and plugin scripts... + * 2088 FIX: cisco_cpu: Dealing with non CPU utilization information correctly... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/cisco_cpu b/checks/cisco_cpu index 03e41d5..d548137 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -30,10 +30,13 @@ cisco_cpu_default_levels = (80.0, 90.0) def inventory_cisco_cpu(info): - if info: + if info and info[0] != [None, None]: return [( None, 'cisco_cpu_default_levels') ] def check_cisco_cpu(item, params, info): + if info[0] == [None, None]: + return 3, 'No information about the CPU utilization available' + if info[0][1]: util = float(info[0][1]) else:

9 years, 6 months

Check_MK Git: check_mk: memory.include: minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 531abbb61099d0d76353f4e1d91f525583e9a19c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=531abbb61099d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 3 17:29:48 2015 +0100 memory.include: minor code cleanup --- checks/memory.include | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/checks/memory.include b/checks/memory.include index 252cb47..4a1a8b0 100644 --- a/checks/memory.include +++ b/checks/memory.include @@ -25,46 +25,52 @@ # Boston, MA 02110-1301 USA. def check_memory(used, total, params): - + # Convert old-style tuple params to dict if params: if type(params) == tuple: params = { "levels" : ("perc_used", params) } else: params = { "levels" : ("ignore") } + perc_used = (float(used) / total) * 100 infotext = "Memory usage: %s (Used: %s, Total: %s)" % ( - get_percent_human_readable(perc_used), - get_bytes_human_readable(used), - get_bytes_human_readable(total)) + get_percent_human_readable(perc_used), + get_bytes_human_readable(used), + get_bytes_human_readable(total)) levelstext = "" + + # No levels imposed if params["levels"][0] == "ignore": warn_abs, crit_abs = None, None status = 0 - elif params["levels"][0] == "perc_used": - warn_rel, crit_rel = params["levels"][1] - warn_abs, crit_abs = (warn_rel/100.0) * total, (crit_rel/100.0) * total - levelstext = " (warn/crit at %s/%s used)" % (get_percent_human_readable(warn_rel), - get_percent_human_readable(crit_rel)) - elif params["levels"][0] == "abs_free": - warn_abs_free, crit_abs_free = params["levels"][1] - warn_abs, crit_abs = total - warn_abs_free, total - crit_abs_free - levelstext = " (warn/crit below %s/%s free)" % ( - get_bytes_human_readable(warn_abs_free), - get_bytes_human_readable(crit_abs_free)) + # Absolute or percentual levels + else: + if params["levels"][0] == "perc_used": + warn_perc, crit_perc = params["levels"][1] + warn_abs = (warn_perc / 100.0) * total + crit_abs = (crit_perc / 100.0) * total + levelstext = " (warn/crit at %s/%s used)" % ( + get_percent_human_readable(warn_perc), + get_percent_human_readable(crit_perc)) + + elif params["levels"][0] == "abs_free": + warn_abs_free, crit_abs_free = params["levels"][1] + warn_abs = total - warn_abs_free + crit_abs = total - crit_abs_free + levelstext = " (warn/crit below %s/%s free)" % ( + get_bytes_human_readable(warn_abs_free), + get_bytes_human_readable(crit_abs_free)) - if warn_abs and crit_abs: if used >= crit_abs: status = 2 elif used >= warn_abs: status = 1 - else: - status = 0 - if status: - infotext += levelstext + if status: + infotext += levelstext perfdata = [ ("memory_used", used, warn_abs, crit_abs, 0, total) ] return status, infotext, perfdata

9 years, 6 months

Check_MK Git: check_mk: #2054 FIX Sidebar snapin "Tree of folders": fixed exception when using localized default value

by Andreas Boesl

Module: check_mk Branch: master Commit: 227e1665ad385609454fb9231f9c17d45df1b68a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=227e1665ad3856… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 3 16:52:26 2015 +0100 #2054 FIX Sidebar snapin "Tree of folders": fixed exception when using localized default value The sidebar snapin "Tree of folders" had an encoding exception in the following setting <ul> <li>The user never changed the default values for this snapin</li> <li>The interface language was different from the default language</li> <li>The translated text in the snapin contained umlauts like ä, ö, ü</li> </ul> This has been fixed. --- .werks/2054 | 18 ++++++++++++++++++ ChangeLog | 1 + web/plugins/sidebar/wato.py | 2 ++ 3 files changed, 21 insertions(+) diff --git a/.werks/2054 b/.werks/2054 new file mode 100644 index 0000000..f21b402 --- /dev/null +++ b/.werks/2054 @@ -0,0 +1,18 @@ +Title: Sidebar snapin "Tree of folders": fixed exception when using localized default value +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425397160 + +The sidebar snapin "Tree of folders" had an encoding exception in the following setting + +<ul> +<li>The user never changed the default values for this snapin</li> +<li>The interface language was different from the default language</li> +<li>The translated text in the snapin contained umlauts like ä, ö, ü</li> +</ul> + +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 99bf3bc..c17ee8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -270,6 +270,7 @@ * 2008 FIX: Users created during basic auth login get the role assigned configured in "default user profile"... * 2011 FIX: "Service Group" view sorts/groups the services now correctly by host * 2024 FIX: Views: Fixed problem when filtering views by strings containing umlauts... + * 2054 FIX: Sidebar snapin "Tree of folders": fixed exception when using localized default value... WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index cb3adfc..67ecc45 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -227,6 +227,8 @@ def render_wato_foldertree(): # Render link target selection # selected_topic, selected_target = config.load_user_file("foldertree", (_('Hosts'), 'allhosts')) + if type(selected_topic) == unicode: + selected_topic = selected_topic.encode("utf-8") views.load_views() dashboard.load_dashboards()

9 years, 6 months

Check_MK Git: check_mk: Fixed some typos

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6304099c0f6ab24a4f67fff5105d68aad7c6a493 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6304099c0f6ab2… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Mar 3 15:36:51 2015 +0100 Fixed some typos --- web/plugins/wato/check_parameters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9f74ac8..369aea4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3563,7 +3563,7 @@ register_check_parameters( "humidity", _("Humidity Levels"), Tuple( - help = _("This Rulset sets the threshold limits for humidity sensors"), + help = _("This Ruleset sets the threshold limits for humidity sensors"), elements = [ Integer(title = _("Critical at or below"), unit="%" ), Integer(title = _("Warning at or below"), unit="%" ), @@ -3581,7 +3581,7 @@ register_check_parameters( "single_humidity", _("Humidity Levels for devices with a single sensor"), Tuple( - help = _("This Rulset sets the threshold limits for humidity sensors"), + help = _("This Ruleset sets the threshold limits for humidity sensors"), elements = [ Integer(title = _("Critical at or below"), unit="%" ), Integer(title = _("Warning at or below"), unit="%" ), @@ -3974,7 +3974,7 @@ register_check_parameters( title = _("Handling for required mirror space"), totext = "", choices = [ - ( False, _("Disregard required mirror space as free space")), + ( False, _("Do not regard required mirror space as free space")), ( True, _("Regard required mirror space as free space")),], help = _("ASM calculates the free space depending on free_mb or required mirror " "free space. Enable this option to set the check against required "

9 years, 6 months

Check_MK Git: check_mk: The wmic_if.ps1 has been replaced by windows_if.ps1.

by Andreas Boesl

Module: check_mk Branch: master Commit: 59663ff22b7966f23459e20891d2d855d7c5914e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59663ff22b7966… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 3 15:30:07 2015 +0100 The wmic_if.ps1 has been replaced by windows_if.ps1. The latter one provides the same information as the previous version, but does additionally report interface teaming information, if applicable. --- .werks/2053 | 11 +++++ ChangeLog | 1 + agents/windows/plugins/windows_if.ps1 | 69 ++++++++++++++++++++++++++++++ agents/windows/plugins/wmic_if.ps1 | 75 --------------------------------- 4 files changed, 81 insertions(+), 75 deletions(-) diff --git a/.werks/2053 b/.werks/2053 new file mode 100644 index 0000000..8d348b1 --- /dev/null +++ b/.werks/2053 @@ -0,0 +1,11 @@ +Title: New windows plugin: windows_if.ps1, renders wmic_if.ps1 obsolete +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1425392870 +Class: feature + +The wmic_if.ps1 has been replaced by windows_if.ps1. +The latter one provides the same information as the previous version, but +does additionally report interface teaming information, if applicable. diff --git a/ChangeLog b/ChangeLog index a799ab2..99bf3bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ * 1893 cisco_power: Now discovers all power supplies, not only redundant ones... * 2052 winperf_if: Now able to automatically group teamed interfaces and more... NOTE: Please refer to the migration notes! + * 2053 New windows plugin: windows_if.ps1, renders wmic_if.ps1 obsolete... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/windows/plugins/windows_if.ps1 b/agents/windows/plugins/windows_if.ps1 new file mode 100644 index 0000000..14bdafb --- /dev/null +++ b/agents/windows/plugins/windows_if.ps1 @@ -0,0 +1,69 @@ +# runs on windows 2003 or newer +if ([Environment]::OSVersion.Version.Major -ge "5"){ + Write-Host "<<<winperf_if:sep(9)>>>" +} + +# runs on windows 2012 or newer +# [teaming_start] +# TeamName TeamingMode LoadBalancingAlgorithm MemberMACAddresses MemberNames MemberDescriptions Speed GUID +# LAN Lacp Dynamic 5C:F3:FC:37:2A:34;5C:F3:FC:37:2A:30 Ethernet;Ethernet 2 QLogic 1/10GbE Server Adapter #2;QLogic 1/10GbE Server Adapter 10000000000;10000000000 {11477AB1-0A749C-8768-A17F47C02A1F};{2B232067-0EE5-41EE-B498-0CA2FE8715D0} +# [teaming_end] +if ((([Environment]::OSVersion.Version.Major -eq "6") -and ([Environment]::OSVersion.Version.Minor -ge "2")) -or ([Environment]::OSVersion.Version.Major -ge "7")){ + $teams = Get-NetLbfoTeam + if ($teams){ + Write-Host "[teaming_start]" + Write-Host "TeamName`tTeamingMode`tLoadBalancingAlgorithm`tMemberMACAddresses`tMemberNames`tMemberDescriptions`tSpeed`tGUID" + foreach ($team in $teams){ + Write-Host -NoNewline $team.Name`t + Write-Host -NoNewline $team.tm`t + Write-Host -NoNewline $team.lba`t + foreach ($slave in $team.members){ + $membermacs += (Get-Netadapter $slave).MacAddress + ";" + $members += $slave + ";" + $netinterface += (Get-Netadapter $slave).InterfaceDescription + ";" + $netspeed += [String](Get-Netadapter $slave).Speed + ";" + $netguid += (Get-Netadapter $slave).InterfaceGuid + ";" + } + $membermacs = $membermacs.Replace("-",":") + $membermacs = $membermacs.TrimEnd(";") + "`t" + Write-Host -NoNewline $membermacs + $members = $members.TrimEnd(";") + "`t" + Write-Host -NoNewline $members + $netinterface = $netinterface.TrimEnd(";") + "`t" + Write-Host -NoNewline $netinterface + $netspeed = $netspeed.TrimEnd(";") + "`t" + Write-Host -NoNewline $netspeed + $netguid = $netguid.TrimEnd(";") + Write-Host $netguid + } + Write-Host "[teaming_end]" + } +} + +# runs on windows 2003 or newer +# Node MACAddress Name NetConnectionID NetConnectionStatus Speed GUID +# NODE01 42:F2:E9:21:BE:D1 IBM USB Remote NDIS Network Device #2 Local Area Connection 2 2 9728000 {A447D54F-0E4B-40B3-9FBA-228F7DCE8FC7} +# NODE01 40:F2:E9:21:BE:D2 Intel(R) I350 Gigabit Network Connection Ethernet 3 7 9223372036854775807 {1C656D16-F30D-4714-9A7E-B3D3F9AD52FA} +# NODE01 40:F2:E9:21:BE:D3 Intel(R) I350 Gigabit Network Connection #2 Ethernet 4 7 9223372036854775807 {F9C89525-0500-4A6B-95AC-95F66BDA739A} +# NODE01 40:F2:E9:21:BE:D4 Intel(R) I350 Gigabit Network Connection #3 Ethernet 5 7 9223372036854775807 {A0D28181-6DF8-4A80-9837-D2933D013510} +# NODE01 40:F2:E9:21:BE:D5 Intel(R) I350 Gigabit Network Connection #4 Ethernet 6 7 9223372036854775807 {95CA2691-7AFA-4842-A769-F521FE6173B2} +# NODE01 5C:F3:FC:37:2A:30 QLogic 1/10GbE Server Adapter Ethernet 2 2 {2B232067-0EE5-41EE-B498-0CA2FE8715D0} +# NODE01 5C:F3:FC:37:2A:34 QLogic 1/10GbE Server Adapter Ethernet 2 {11477AB1-0A73-449C-8768-A17F47C02A1F} +# NODE01 5C:F3:FC:37:2A:30 Microsoft Network Adapter Multiplexor Driver LAN 2 20000000000 {4FCE4C48-6217-465A-B807-B61499AE570C} +if ([Environment]::OSVersion.Version.Major -ge "5"){ + Write-Host "Node`tMACAddress`tName`tNetConnectionID`tNetConnectionStatus`tSpeed`tGUID" + foreach ($net in Get-WmiObject Win32_NetworkAdapter) + { + if ($net.netconnectionid){ + Write-Host -NoNewline $env:COMPUTERNAME`t + Write-Host -NoNewline $net.macaddress`t + Write-Host -NoNewline $net.name`t + Write-Host -NoNewline $net.netconnectionid`t + Write-Host -NoNewline $net.netconnectionstatus`t + Write-Host -NoNewline $net.speed`t + Write-Host $net.GUID + } + } +} + + diff --git a/agents/windows/plugins/wmic_if.ps1 b/agents/windows/plugins/wmic_if.ps1 deleted file mode 100644 index e51da8c..0000000 --- a/agents/windows/plugins/wmic_if.ps1 +++ /dev/null @@ -1,75 +0,0 @@ -# Note: This plugin should only being used when the plugin wmic_if.bat does -# deliver insufficient data. For example, teaming interfaces in Win2012 -# are not reported correctly (missing speed) by the wmic_if.bat script. -# -# This plugin extends the information reported by the performance counters -# with the following fields: -# Nodename -# MACAddress -# Interface Name -# Interface NetConnectionID -# Interface Driver Desription -# Connection Status -# Interface Speed - -try -{ - $teams = Get-NetLbfoTeam -} catch {} - -Function getSpeed($speed_text) -{ - $value = 0 - $factor = 1 - $speed_tokens = $speed_text.split(" ") - if ($speed_tokens.length -eq 2) { - $value = [float]$speed_tokens[0] - $unit = $speed_tokens[1] - if ($unit.tolower() -eq "gbps") - { - $factor = 1000000000 - } - elseif ($unit.tolower() -eq "mbps") - { - $factor = 1000000 - } - elseif ($unit.tolower() -eq "kbps") - { - $factor = 1000 - } - } - return $($value * $factor) -} - -Function getStatus($status_text) -{ - if ($status_text.tolower() -eq "up") - { - return "2" - } - else - { - return "0"# - } -} - -Write-Host "<<<winperf_if:sep(9)>>>" - -Write-Host "Node`tMACAddress`tName`tNetConnectionID`tInterfaceDescription`tNetConnectionStatus`tSpeed" -foreach ($net in Get-Netadapter -IncludeHidden) -{ - $address = $net.MacAddress -replace "-", ":" - Write-Host -NoNewline "$env:COMPUTERNAME`t" - Write-Host -NoNewline "$($address)`t" - Write-Host -NoNewline "$($net.DriverDescription)`t" - Write-Host -NoNewline "$($net.Name)`t" - Write-Host -NoNewline "$($net.InterfaceDescription)`t" - - $status = "0" - if ($net.Status) { - $status = "$(getStatus($net.Status.tostring()))" - } - Write-Host -NoNewline "$status`t" - Write-Host $(getSpeed($net.LinkSpeed)) -} -

9 years, 6 months

Check_MK Git: check_mk: updated werk description

by Andreas Boesl

Module: check_mk Branch: master Commit: d81055942e27b341d805adcaf3c48122026a78c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d81055942e27b3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 3 15:00:53 2015 +0100 updated werk description --- .werks/2052 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.werks/2052 b/.werks/2052 index 6ece51a..b5e646c 100644 --- a/.werks/2052 +++ b/.werks/2052 @@ -21,6 +21,7 @@ of each interface. If you have used the configuration option <tt>if_inventory_uses_alias</tt>, the interface will now have a different name. Therefore the service description changes and the performance data will get lost. -A workaround for this problem is to use <tt>if_inventory_uses_description</tt> instead.... -For windows hosts the settings <tt>if_inventory_uses_alias</tt> and <tt>if_inventory_uses_description</tt> -meant the same in previous version. With this update the meaning of <tt>if_inventory_uses_alias</tt> has changed. +A workaround for this problem is to use <tt>if_inventory_uses_description</tt> instead. +For windows hosts the setting <tt>if_inventory_uses_alias</tt> and <tt>if_inventory_uses_description</tt> +meant the same in previous versions. With this update only the meaning of <tt>if_inventory_uses_alias</tt> has changed. +

9 years, 6 months

Check_MK Git: check_mk: The winperf_if check is now able to detect teamed interfaces.

by Andreas Boesl

Module: check_mk Branch: master Commit: 1e70f153da7b984bffd7e866a7e7a68df200cc6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e70f153da7b98… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 3 14:56:55 2015 +0100 The winperf_if check is now able to detect teamed interfaces. This information is provided by the updated wmic_if.ps1 plugin. Right now, the teamed interfaces are no longer listed separately. There will be a configuration option soon which allows you to configure this behaviour. H2: Incompatible change: The service descriptions for this check did never show the human readable/editable interface name - the NetConnectionID. This has been fixed. This information is now provided in the alias information of each interface. If you have used the configuration option <tt>if_inventory_uses_alias</tt>, the interface will now have a different name. Therefore the service description changes and the performance data will get lost. A workaround for this problem is to use <tt>if_inventory_uses_description</tt> instead.... For windows hosts the settings <tt>if_inventory_uses_alias</tt> and <tt>if_inventory_uses_description</tt> meant the same in previous version. With this update the meaning of <tt>if_inventory_uses_alias</tt> has changed. --- .werks/2052 | 26 +++++++++++++++++ ChangeLog | 2 ++ checks/winperf_if | 82 +++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 85 insertions(+), 25 deletions(-) diff --git a/.werks/2052 b/.werks/2052 new file mode 100644 index 0000000..6ece51a --- /dev/null +++ b/.werks/2052 @@ -0,0 +1,26 @@ +Title: winperf_if: Now able to automatically group teamed interfaces and more +Level: 2 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1425390249 +Class: feature + +The winperf_if check is now able to detect teamed interfaces. +This information is provided by the updated wmic_if.ps1 plugin. + +Right now, the teamed interfaces are no longer listed separately. +There will be a configuration option soon which allows you to configure +this behaviour. + +H2: Incompatible change +The service descriptions for this check did never show the human +readable/editable interface name - the NetConnectionID. +This has been fixed. This information is now provided in the alias information +of each interface. +If you have used the configuration option <tt>if_inventory_uses_alias</tt>, the +interface will now have a different name. Therefore the service description changes +and the performance data will get lost. +A workaround for this problem is to use <tt>if_inventory_uses_description</tt> instead.... +For windows hosts the settings <tt>if_inventory_uses_alias</tt> and <tt>if_inventory_uses_description</tt> +meant the same in previous version. With this update the meaning of <tt>if_inventory_uses_alias</tt> has changed. diff --git a/ChangeLog b/ChangeLog index 993d7d5..a799ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,8 @@ * 1952 check_mk_agent.linux: integrated runas plugin into check_mk_agent.linux... * 2083 Added Siemens PLC (SPS) monitoring... * 1893 cisco_power: Now discovers all power supplies, not only redundant ones... + * 2052 winperf_if: Now able to automatically group teamed interfaces and more... + NOTE: Please refer to the migration notes! * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/winperf_if b/checks/winperf_if index eb67c56..2c9627e 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -62,7 +62,7 @@ def convert_winperf_if(info): def canonize_nic_name(n): - return n.replace("_", " ").replace(" ", " ") + return n.replace("_", " ").replace(" ", " ").rstrip() lines = iter(info) lines.next() # skip line with timestamp and counter number @@ -70,9 +70,28 @@ def convert_winperf_if(info): nics = dict([(n, {}) for n in nic_names]) # Scan lines with counters + is_teaming_line = False + teaming_headers = [] + teaming_info = {} + try: while True: line = lines.next() + + # Process teaming information + if line[0].startswith("[teaming_start]"): + is_teaming_line = True + teaming_headers = lines.next() + continue + elif line[0].startswith("[teaming_end]"): + is_teaming_line = False + continue + if is_teaming_line: + as_dict = dict(zip(teaming_headers, map(lambda x: x.rstrip(), line))) + for guid in as_dict["GUID"].split(";"): + teaming_info[guid] = as_dict + continue + counter = saveint(line[0]) if counter: for nr, value in enumerate(line[1:len(nic_names)+1]): @@ -83,14 +102,24 @@ def convert_winperf_if(info): headers = line while True: line = lines.next() - as_dict = dict(zip(headers, line)) - nic_name = canonize_nic_name(as_dict["Name"]) - try: - conn_id = int(as_dict["NetConnectionID"].split()[-1]) - nic_name += " " + str(conn_id) - except: - pass - + if line[0].startswith("[teaming_start]"): + is_teaming_line = True + teaming_headers = lines.next() + break + + as_dict = dict(zip(headers, map(lambda x: x.rstrip(), line))) + + # Unfortunately teamed interfaces loose their #x index and are no longer + # distinguishable with the data from the Win32_NetworkAdapter. + # Fortunately this index information is still available in the teaming section + # The GUID is used to combine the two datasets + guid = as_dict.get("GUID") + if guid in teaming_info: + guid_to_name = dict(zip(teaming_info[guid]["GUID"].split(";"), + teaming_info[guid]["MemberDescriptions"].split(";"))) + nic_name = canonize_nic_name(guid_to_name[guid]) + else: + nic_name = canonize_nic_name(as_dict["Name"]) def transform_name(name): # Intel[R] PRO 1000 MT-Desktopadapter__3 (perf counter) @@ -127,18 +156,9 @@ def convert_winperf_if(info): found_match = True break else: + found_match = True nic_name = mod_nic_name - # The last straw. Try to find this the name as exact match in other fields - if not found_match: - for entry in [ "NetConnectionID", "InterfaceDescription" ]: - if as_dict.get(entry): - mod_nic_name = transform_name(as_dict.get(entry)) - if mod_nic_name in nic_names: - nic_name = mod_nic_name - found_match = True - break - if not found_match: # Ignore interfaces that do not have counters continue @@ -147,10 +167,11 @@ def convert_winperf_if(info): except StopIteration: pass + # Now convert the dicts into the format that is needed by if.include converted = [] - # Sort NIC names are create artifical index + # Sort NIC names and create artifical index nic_index = dict(map(lambda x: (x[1], x[0] + 1), enumerate(nic_names))) nic_names.sort(reverse=True) @@ -158,17 +179,28 @@ def convert_winperf_if(info): nic = nics[nic_name] mac_txt = nic.get('MACAddress') bandwidth = saveint(nic.get('Speed')) + # Some interfaces report several exabyte as bandwidth when down.. + if bandwidth > 1024**5: + # Greater than petabyte + bandwidth = 0 + if mac_txt: mac = "".join(map(lambda x: chr(int(x, 16)), mac_txt.split(':'))) else: mac = '' + + index_info = str(nic_index[nic_name]) + # Automatically group teamed interfaces + if nic.get("GUID") in teaming_info: + index_info = ( teaming_info[nic.get("GUID")]["TeamName"], index_info ) + converted.append(( - str(nic_index[nic_name]), + index_info, nic_name, "loopback" in nic_name.lower() and '24' or '6', - bandwidth or nic[10], # Aktuelle Bandbreite - # NetConnectionStatus: 2 st up, 7 ist 'not connected'. If the plugin - # wmic_if is missing and we have link information we need to assume 'up': + bandwidth or nic[10], # Bandwidth + # NetConnectionStatus: 2 means 'up', 7 is 'not connected'. If the plugin + # wmic_if is missing and we have link information we have to assume 'up': nic.get('NetConnectionStatus', '2') == '2' and '1' or '2', nic[-246], # ifInOctets, nic[14], # inucast @@ -183,7 +215,7 @@ def convert_winperf_if(info): nic[30], # ifOutDiscards nic[32], # ifOutErrors nic[34], # ifOutQLen - nic_name, + nic.get('NetConnectionID', nic_name), mac, ))

9 years, 6 months

Check_MK Git: check_mk: #2051 FIX windows agent: no longer outputs stderr of local and plugin scripts

by Andreas Boesl

Module: check_mk Branch: master Commit: 46470bdcd889bfc8ec0310547a835d0e6309eb59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46470bdcd889bf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 3 14:12:35 2015 +0100 #2051 FIX windows agent: no longer outputs stderr of local and plugin scripts Unlike the linux agents, the windows agent did output data from stderr. This caused invalid formatted sections in case of (tolerable) errors. --- .werks/2051 | 10 ++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 300032 -> 300032 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 300032 -> 300032 bytes agents/windows/check_mk_agent.cc | 11 ++++++++++- agents/windows/check_mk_agent.exe | Bin 181760 -> 181760 bytes agents/windows/check_mk_agent.msi | Bin 716288 -> 716288 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 181760 -> 181760 bytes agents/windows/install_agent-64.exe | Bin 177830 -> 177834 bytes agents/windows/install_agent.exe | Bin 158790 -> 158868 bytes 11 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.werks/2051 b/.werks/2051 new file mode 100644 index 0000000..9e2f7c6 --- /dev/null +++ b/.werks/2051 @@ -0,0 +1,10 @@ +Title: windows agent: no longer outputs stderr of local and plugin scripts +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1425388179 +Class: fix + +Unlike the linux agents, the windows agent did output data from stderr. +This caused invalid formatted sections in case of (tolerable) errors. diff --git a/ChangeLog b/ChangeLog index c23e445..993d7d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -219,6 +219,7 @@ * 2050 FIX: netapp_api_if: Fixed invalid speed warning for virtual interface groups... * 2086 FIX: apc_ats_status: Fixed exception when source different than selected source * 2087 FIX: netapp_api_temp: Fixed exception when dealing with old discovered checks... + * 2051 FIX: windows agent: no longer outputs stderr of local and plugin scripts... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/windows/build_version b/agents/windows/build_version index c8b255f..065fd3e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -135 +137 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 8b2ce71..0b601da 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 47692f8..8247c28 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index b49497d..1d4f63f 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2854,7 +2854,15 @@ int launch_program(script_container* cont) si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW; si.wShowWindow = SW_HIDE; si.hStdOutput = newstdout; - si.hStdError = newstdout; + + + // Redirect sterr to NUL device + SECURITY_ATTRIBUTES secattr; + secattr.nLength = sizeof secattr; + secattr.lpSecurityDescriptor = NULL; + secattr.bInheritHandle = TRUE; + HANDLE hnul = CreateFile("NUL", GENERIC_WRITE, 0, &secattr, OPEN_EXISTING, 0, NULL); + si.hStdError = hnul; // spawn the child process if (!CreateProcess(NULL,cont->path,NULL,NULL,TRUE,CREATE_NEW_CONSOLE, @@ -2935,6 +2943,7 @@ int launch_program(script_container* cont) CloseHandle(pi.hProcess); CloseHandle(newstdout); CloseHandle(read_stdout); + CloseHandle(hnul); return exit_code; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 36c527a..92111a6 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index c0f3b80..ea97741 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 8593dd1..b5b5eda 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 812e260..18edc83 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 34ec659..c1e1ab0 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015