Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #2017 FIX Solaris-Agent: Prevent hanging agent in uptime section

by Lars Michelsen

Module: check_mk Branch: master Commit: 709c67b1c39570bc673eb9164b5f7f377c936f83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=709c67b1c39570… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 25 11:47:40 2015 +0100 #2017 FIX Solaris-Agent: Prevent hanging agent in uptime section It happened running on a Solaris 8 zone, on a Solaris 10 LDOM, on Sun/Oracle T5 that the agent hung while processing the <tt>uptime</tt> section of the agent. Many hanging truss and nawk processes were found, which can lead to a unresponsive and/or crashed system. The uptime section generating code has been changed and replaced by another mechanism. Thanks to Clint Squires for analyzing the problem and providing a fix! --- .werks/2017 | 17 +++++++++++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 7 +++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/2017 b/.werks/2017 new file mode 100644 index 0000000..4301764 --- /dev/null +++ b/.werks/2017 @@ -0,0 +1,17 @@ +Title: Solaris-Agent: Prevent hanging agent in uptime section +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424861065 + +It happened running on a Solaris 8 zone, on a Solaris 10 LDOM, on Sun/Oracle T5 +that the agent hung while processing the <tt>uptime</tt> section of the agent. +Many hanging truss and nawk processes were found, which can lead to a unresponsive +and/or crashed system. + +The uptime section generating code has been changed and replaced by another mechanism. + +Thanks to Clint Squires for analyzing the problem and providing a fix! diff --git a/ChangeLog b/ChangeLog index ead8bf0..53b1d87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -190,6 +190,7 @@ * 2033 FIX: check_mk-zfs_arc_cache: add Perf-O-Meter * 2034 FIX: netapp_api_volumes: added Perf-O-Meter * 2035 FIX: check_mk-netapp_api_if, check_mk-if_brocade: added missing Perf-O-Meters + * 2017 FIX: Solaris-Agent: Prevent hanging agent in uptime section... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 1bc04d5..7cf46a6 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -221,10 +221,9 @@ fi # /proc/uptime # Simulated output of Linux /proc/uptime echo '<<<uptime>>>' -proc0=$(ls -td /proc/* | tail -1) -ctime=$(nawk 'BEGIN{print srand()}') -btime=$(truss -v lstat -t lstat ls -d $proc0 2>&1 | nawk '/ct = /{printf "%d\n", $9}') -echo $(($ctime - $btime)) +ctime=`nawk 'BEGIN{print srand()}'`; +btime=`kstat '-p' 'unix:::boot_time' 2>&1|grep 'boot_time'|awk '{print $2}'`; +echo $(($ctime - $btime)); # NTP

9 years, 4 months

Check_MK Git: check_mk: Fixed encoding and Tabs in wmic_if.ps1

by Mathias Kettner

Module: check_mk Branch: master Commit: 2b21f94e8e3c2dfb3b2f75d1e53aa5c041d1618c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b21f94e8e3c2d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 25 11:32:34 2015 +0100 Fixed encoding and Tabs in wmic_if.ps1 --- agents/windows/plugins/wmic_if.ps1 | Bin 3634 -> 1962 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/plugins/wmic_if.ps1 b/agents/windows/plugins/wmic_if.ps1 index 9748b5a..e51da8c 100644 Binary files a/agents/windows/plugins/wmic_if.ps1 and b/agents/windows/plugins/wmic_if.ps1 differ

9 years, 4 months

Check_MK Git: check_mk: #2016 FIX Fixed service discovery /

by Lars Michelsen

monitoring on hosts which have only piggyback data (e.g. ESX VMs) Message-ID: <54ed9787.9r/FyiTFgBRZz5eh%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: bc2048f04de76710b77e7f60da0c8809f1509e0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc2048f04de767… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 25 10:36:02 2015 +0100 #2016 FIX Fixed service discovery / monitoring on hosts which have only piggyback data (e.g. ESX VMs) When having hosts configured which have no agent on their own ("No agent" configured via WATO), but get piggyback data from another host, could not be inventorized. This has been fixed now. So if you have, for example, an ESX server with several VMs, you configured each VM as host in WATO and set Agent type to No Agent, you can now discover the services based on the piggyback data again. --- .werks/2016 | 15 +++++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 22 ++++++++++++++++------ modules/discovery.py | 2 +- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/.werks/2016 b/.werks/2016 new file mode 100644 index 0000000..43c3cbd --- /dev/null +++ b/.werks/2016 @@ -0,0 +1,15 @@ +Title: Fixed service discovery / monitoring on hosts which have only piggyback data (e.g. ESX VMs) +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424856806 + +When having hosts configured which have no agent on their own ("No agent" configured via WATO), +but get piggyback data from another host, could not be inventorized. This has been fixed now. + +So if you have, for example, an ESX server with several VMs, you configured each VM as host +in WATO and set Agent type to No Agent, you can now discover the services +based on the piggyback data again. diff --git a/ChangeLog b/ChangeLog index 33f3b95..ead8bf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * 2012 FIX: Piggyback hostname translation can now deal correctly with umlauts * 2014 FIX: Fixed different issues running Check_MK on CentOS 5.x * 2037 FIX: Inventorize piggy back data even if access to normal agent fails + * 2016 FIX: Fixed service discovery / monitoring on hosts which have only piggyback data (e.g. ESX VMs)... Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 50d471f..71cf50f 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -528,10 +528,8 @@ def add_persisted_info(hostname, info): store_persisted_info(hostname, persisted) -def get_piggyback_info(hostname): - output = "" - if not hostname: - return output +def get_piggyback_files(hostname): + files = [] dir = tmp_dir + "/piggyback/" + hostname if os.path.exists(dir): for sourcehost in os.listdir(dir): @@ -545,9 +543,21 @@ def get_piggyback_info(hostname): os.remove(file_path) continue - verbose("Using piggyback information from host %s.\n" % sourcehost) + files.append((sourcehost, file_path)) + return files + + +def has_piggyback_info(hostname): + return get_piggyback_files(hostname) != [] - output += file(file_path).read() + +def get_piggyback_info(hostname): + output = "" + if not hostname: + return output + for sourcehost, file_path in get_piggyback_files(hostname): + verbose("Using piggyback information from host %s.\n" % sourcehost) + output += file(file_path).read() return output diff --git a/modules/discovery.py b/modules/discovery.py index 2b1f6dd..78fe93f 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -290,7 +290,7 @@ def discover_services(hostname, check_types, use_caches, do_snmp_scan, ipaddress if check_type not in check_types and check_uses_snmp(check_type): check_types.append(check_type) - if is_tcp_host(hostname): + if is_tcp_host(hostname) or has_piggyback_info(hostname): check_types += discoverable_check_types('tcp') # Make hostname available as global variable in discovery functions

9 years, 4 months

Check_MK Git: check_mk: Fixed some English texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 4178d35c90cf3060e1221fab1cfc9e5c7d77e9c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4178d35c90cf30… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 25 10:23:58 2015 +0100 Fixed some English texts --- mkeventd/web/plugins/visuals/mkeventd.py | 2 +- web/plugins/wato/active_checks.py | 16 ++++++++-------- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mkeventd/web/plugins/visuals/mkeventd.py b/mkeventd/web/plugins/visuals/mkeventd.py index dd71d4e..bd22cd1 100644 --- a/mkeventd/web/plugins/visuals/mkeventd.py +++ b/mkeventd/web/plugins/visuals/mkeventd.py @@ -62,7 +62,7 @@ if mkeventd_enabled: title = _('Event ID'), )), ('history_line', Integer( - title = _('History Line'), + title = _('History Line Number'), )), ] } diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 507dee3..97683b5 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -670,7 +670,7 @@ register_rule(group, TextUnicode( title = _("Name"), help = _("Will be used in the service description. If the name starts with " - "a caret (^), the service description will not be prefixed with HTTP." ), + "a caret (<tt>^</tt>), the service description will not be prefixed with <tt>HTTP</tt>." ), allow_empty = False), Alternative( title = _("Mode of the Check"), @@ -1274,7 +1274,7 @@ def PluginCommandLine(addhelp = ""): return TextAscii( title = _("Command line"), help = _("Please enter the complete shell command including " - "path name and arguments to execute. You can use Nagios " + "path name and arguments to execute. You can use monitoring " "macros here. The most important are:<ul>" "<li><tt>$HOSTADDRESS$</tt>: The IP address of the host</li>" "<li><tt>$HOSTNAME$</tt>: The name of the host</li>" @@ -1292,12 +1292,12 @@ def PluginCommandLine(addhelp = ""): register_rule(group, "custom_checks", Dictionary( - title = _("Classical active and passive Nagios checks"), - help = _("With this ruleset you can configure "classical Nagios checks" " + title = _("Classical active and passive Monitoring checks"), + help = _("With this ruleset you can configure "classical Monitoring checks" " "to be executed directly on your monitoring server. These checks " "will not use Check_MK. It is also possible to configure passive " - "checks that are fed with data from external sources via the Nagios " - "command pipe."), + "checks that are fed with data from external sources via the " + "command pipe of the monitoring core."), elements = [ ( "service_description", TextUnicode( @@ -1682,8 +1682,8 @@ register_rule(group, ("duration", Tuple( title = _("Loop duration"), elements = [ - Age(title = _("Warning if above or equal")), - Age(title = _("Critical if above or equal")), + Age(title = _("Warning at")), + Age(title = _("Critical at")), ]) ), ('delete_messages', FixedValue(True, diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 282fd13..e7e11bc 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1280,7 +1280,7 @@ register_configvar(group, min_value = 1, default_value = 720), title = _("Enable regular service discovery checks"), - help = _("If enabled, Check_MK will create one additional check per host " + help = _("If enabled, Check_MK will create one additional service per host " "that does a regular check, if the service discovery would find new services " "currently un-monitored.")), need_restart = True) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e0bc39e..a8af24f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7646,7 +7646,7 @@ register_check_parameters( "plug_count", _("Number of active Plugs"), Tuple( - help = _("Levels for the number of active plugs in a devics."), + help = _("Levels for the number of active plugs in a device."), elements = [ Integer(title = _("critical if below or equal"), default_value = 30), Integer(title = _("warning if below or equal"), default_value = 32),

9 years, 4 months

Check_MK Git: check_mk: added check_mk_agent_vanilla msi template

by Andreas Boesl

Module: check_mk Branch: master Commit: b7d6c838cf412c90e15bdb1614299cc9ade431f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7d6c838cf412c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 25 10:03:26 2015 +0100 added check_mk_agent_vanilla msi template --- .../windows_msi/check_mk_agent_vanilla.wxs | 144 ++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs b/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs new file mode 100644 index 0000000..bde619a --- /dev/null +++ b/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs @@ -0,0 +1,144 @@ +<?xml version="1.0"?> +<?define CompanyName = "Mathias Kettner GmbH"?> +<?define ProductVersion = "1.2.5"?> +<?define ProductUpgradeCode = "854bb2c1-f4aa-4c5c-89e4-8fb0bdfb9ee4"?> +<?define PackageCode = "08012468-53DE-42A3-BAA9-FE4C2A129135"?> + + +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" + xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'> + <Product Id="*" UpgradeCode="$(var.ProductUpgradeCode)" + Name="Check_MK Agent MSI" Version="$(var.ProductVersion)" Manufacturer="Mathias Kettner GmbH" Language="1033"> + <Package Id="$(var.PackageCode)" InstallerVersion="200" Platform="x86" Compressed="yes" Description="Check_MK 32/64 bit MSI installer"/> + <Media Id="1" Cabinet="product.cab" CompressionLevel="none" EmbedCab="yes"/> + + <Property Id="REINSTALLMODE" Value="amus" /> + <MajorUpgrade AllowDowngrades="yes" /> + + <Upgrade Id="$(var.ProductUpgradeCode)"> + <UpgradeVersion Minimum="$(var.ProductVersion)" + Property="NEWERVERSIONDETECTED"/> + <UpgradeVersion Minimum="0.0.0" + Maximum="$(var.ProductVersion)" + IncludeMinimum="yes" + IncludeMaximum="no" + Property="OLDERVERSIONBEINGUPGRADED"/> + </Upgrade> + + + <Directory Id="TARGETDIR" Name="SourceDir"> + <Directory Id="ProgramFilesFolder"> + <Directory Id="APPLICATIONROOTDIRECTORY" Name="check_mk"> + <Directory Id="INSTALLDIR"/> + </Directory> + </Directory> + </Directory> + + +  + <Property Id="EXISTINGINSTALLDIR" Secure="yes"> + <RegistrySearch Id="Locate_EXISTINGINSTALLDIR" Root="HKLM" + Key="Software\check_mk_agent" Name="Install_Dir" Type="directory" /> + </Property> + +  + <CustomAction Id="Set_INSTALLDIR" Execute="firstSequence" Property="INSTALLDIR" Value="[EXISTINGINSTALLDIR]" /> + + + <InstallExecuteSequence> + <Custom Action="Set_INSTALLDIR" Before="CostFinalize"><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom> + </InstallExecuteSequence> + + <InstallUISequence> + <Custom Action="Set_INSTALLDIR" Before="CostFinalize"><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom> + </InstallUISequence> + + <Property Id="INSTALLSERVICE" Value="1" /> + + <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/> + <WixVariable Id="WixUILicenseRtf" Value="sources\GPL-V2.rtf" /> + <UIRef Id="CmkWixUI_InstallDir"/> + + <CustomAction Id="install_service" + Directory ="INSTALLDIR" + ExeCommand='[INSTALLDIR]check_mk_agent.exe install' + Execute ="immediate" + Return ="ignore"/> + + <CustomAction Id="uninstall_service" + Directory ="INSTALLDIR" + ExeCommand='[INSTALLDIR]check_mk_agent.exe remove' + Execute ="immediate" + Return ="ignore"/> + + <CustomAction Id="uninstall_plugins" + Directory ="INSTALLDIR" + ExeCommand='[INSTALLDIR]uninstall_plugins.bat' + Execute ="immediate" + Return ="ignore"/> + + <CustomAction Id="start_service" + Directory ="INSTALLDIR" + ExeCommand='net start check_mk_agent' + Execute ="immediate" + Return ="ignore"/> + + <CustomAction Id="stop_service" + Directory ="INSTALLDIR" + ExeCommand='net stop check_mk_agent' + Execute ="immediate" + Return ="ignore"/> + + <InstallExecuteSequence> + <Custom Action="install_service" After="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="start_service" After="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + </InstallExecuteSequence> + + <InstallExecuteSequence> + <Custom Action="stop_service" After="InstallInitialize">REMOVE="ALL"</Custom> + <Custom Action='uninstall_service' After='InstallInitialize'>REMOVE="ALL"</Custom> + <Custom Action='uninstall_plugins' After='InstallInitialize'>REMOVE="ALL"</Custom> + </InstallExecuteSequence> + + <DirectoryRef Id="INSTALLDIR"> + <Component Id="agent32" Guid="60d6ba87-1f56-4d24-817f-a5966eb8b116"> + <File Id="check_mk_agent.exe" Source="sources\check_mk_agent.exe" + Name="check_mk_agent.exe" KeyPath="yes" Checksum="yes"/> + <Condition>NOT VersionNT64</Condition> + </Component> + <Component Id="agent64" Guid="7c2e82ec-c80e-436e-9a29-fe7d0e8f3589"> + <File Id="check_mk_agent64.exe" Source="sources\check_mk_agent-64.exe" + Name="check_mk_agent.exe" KeyPath="yes" Checksum="yes"/> + <Condition>VersionNT64</Condition> + </Component> + <Component Id="check_mk.example.ini" Guid="1383472d-d59e-4c7d-beca-02574758212a"> + <File Id="check_mk.example.ini" Source="sources\check_mk.example.ini"/> + </Component> + <Directory Id="LocalName" Name="local"> + <Component Id="localFolder" Guid="f0cdd975-2dad-45c5-b089-d566d7418ae7"> + <CreateFolder Directory="LocalName"/> + </Component> + </Directory> + <Directory Id="PluginName" Name="plugins"> + <Component Id="pluginFolder" Guid="2384da34-a212-4eda-ac1b-365d2f2686ab"> + <CreateFolder Directory="PluginName"/> + </Component> + </Directory> + <Component Id="RegistryEntries" Guid="c1feaa52-851d-4c68-bd3e-6725bbdf6370"> + <RegistryKey Root="HKLM" Key="Software\check_mk_agent"> + <RegistryValue Type="string" Name="Install_Dir" Value="[INSTALLDIR]"/> + </RegistryKey> + </Component> + </DirectoryRef> + + + <Feature Id="Agent" Level="1"> + <ComponentRef Id="agent32"/> + <ComponentRef Id="agent64"/> + <ComponentRef Id="check_mk.example.ini"/> + <ComponentRef Id="localFolder"/> + <ComponentRef Id="pluginFolder"/> + <ComponentRef Id="RegistryEntries"/> + </Feature> + </Product> +</Wix>

9 years, 4 months

Check_MK Git: check_mk: Fixed syntax error in yesterdays commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 0972094cea49c444e3ce8e1c75fd0b3f415ffe4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0972094cea49c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 25 08:20:32 2015 +0100 Fixed syntax error in yesterdays commit --- web/plugins/wato/active_checks.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 2b499e9..507dee3 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -345,6 +345,7 @@ register_rule(group, value = True, title = _("Expect Authoritative DNS Server"), totext = _("Expect Authoritative"), + ) ), ( "response_time", Tuple( @@ -352,11 +353,11 @@ register_rule(group, elements = [ Float( title = _("Warning if above"), - unit = "sec", + unit = _("sec"), default_value = 1), Float( title = _("Critical if above"), - unit = "sec", + unit = _("sec"), default_value = 2), ]) ), @@ -1182,11 +1183,11 @@ register_rule(group, elements = [ Integer( title = _("Warning if above"), - unit = "sec" + unit = _("sec") ), Integer( title = _("Critical if above"), - unit = "sec" + unit = _("sec") ), ]) ),

9 years, 4 months

Check_MK Git: check_mk: Fixed many English texts

by Mathias Kettner

Module: check_mk Branch: master Commit: c78eb4e1ba47ca540bfb6184645a2539e1cea09f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c78eb4e1ba47ca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 24 18:16:34 2015 +0100 Fixed many English texts Conflicts: web/plugins/wato/check_parameters.py --- web/htdocs/wato.py | 2 +- web/plugins/views/commands.py | 2 +- web/plugins/wato/active_checks.py | 15 +++++++-------- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 26 +++++++++++++------------- web/plugins/wato/datasource_programs.py | 2 +- 6 files changed, 24 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c78eb4e1ba…

9 years, 4 months

Check_MK Git: check_mk: Added comment

by Konstantin Büttner

Module: check_mk Branch: master Commit: c0ddbc2a2b0a2c144c88173f768c5cfe184fc931 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0ddbc2a2b0a2c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 24 16:39:41 2015 +0100 Added comment --- checks/temperature.include | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/checks/temperature.include b/checks/temperature.include index 68177c3..a56c8f2 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -262,6 +262,12 @@ def check_temperature(reading, params, dev_unit = "c", return status, infotext, perfdata +# Wraps around check_temperature to check a list of sensors. +# sensorlist is a list of tuples: +# (subitem, temp, kwargs) or (subitem, temp) +# where subitem is a string (sensor-id) +# temp is a string, float or int temperature value +# and kwargs a dict of keyword arguments for check_temperature def check_temperature_list(sensorlist, params):

9 years, 4 months

Check_MK Git: check_mk: temperature.include: Added check_temperature_list function

by Konstantin Büttner

Module: check_mk Branch: master Commit: f52296a2382cc4560f698c256ded89ec6b528d4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f52296a2382cc4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 24 16:23:33 2015 +0100 temperature.include: Added check_temperature_list function --- checks/temperature.include | 163 ++++++++++++++++++++++++++++---------------- 1 file changed, 103 insertions(+), 60 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index 5fc8166..68177c3 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -31,6 +31,38 @@ def fahrenheit_to_celsius(tempf): def celsius_to_fahrenheit(tempc): return (float(tempc) * (9.0 / 5.0)) + 32 +def from_celsius(tempc, unit): + if unit == "f": + return celsius_to_fahrenheit(tempc) + elif unit == "k": + return tempc + 273.15 + else: + return tempc + +def to_celsius(reading, unit): + if type(reading) == tuple: + tuple([to_celsius(x, unit) for x in reading]) + elif unit == "f": + return fahrenheit_to_celsius(reading) + if unit == "k": + return reading - 273.15 + else: + return reading + +# Format number according to its datatype +def render_temp(n, output_unit): + t = from_celsius(n, output_unit) + if type(n) == int: + return "%d" % t + else: + return "%.1f" % t + +temp_unitsym = { +"c": "°C", +"f": "°F", +"k": "K", +} + # Checks Celsius temperature against crit/warn levels defined in params. temp must # be int or float. Parameters: @@ -46,31 +78,6 @@ def check_temperature(reading, params, dev_unit = "c", dev_levels = None, dev_levels_lower = None, dev_status = None, dev_status_name = None): - def from_celsius(tempc, unit): - if unit == "f": - return celsius_to_fahrenheit(tempc) - elif unit == "k": - return tempc + 273.15 - else: - return tempc - - def to_celsius(reading, unit): - if type(reading) == tuple: - tuple([to_celsius(x, unit) for x in reading]) - elif unit == "f": - return fahrenheit_to_celsius(reading) - if unit == "k": - return reading - 273.15 - else: - return reading - - # Format number according to its datatype - def render_temp(n): - t = from_celsius(n, output_unit) - if type(n) == int: - return "%d" % t - else: - return "%.1f" % t def check_temp_levels(temp, warn, crit, warn_lower, crit_lower): if crit != None and temp >= crit: @@ -94,12 +101,6 @@ def check_temperature(reading, params, dev_unit = "c", else: return min(a,b) - unitsym = { - "c": "°C", - "f": "°F", - "k": "K", - } - # Convert legacy tuple params into new dict if params == None or params == (None, None): params = {} @@ -137,22 +138,6 @@ def check_temperature(reading, params, dev_unit = "c", if dev_levels_lower: dev_warn_lower, dev_crit_lower = to_celsius(dev_levels_lower, dev_unit) -# if dev_status: -# warn, crit, warn_lower, crit_lower = usr_warn, usr_crit, usr_warn_lower, usr_crit_lower -# ustatus = check_temp_levels(temp, warn, crit, warn_lower, crit_lower) -# if dlh == "usr": -# status = ustatus -# if dlh == "dev" or dlh == "devdefault": -# warn = crit = warn_lower = crit_lower = None -# status = dev_status -# if dlh == "best": -# status = min(dev_status, ustatus) -# if dlh == "worst": -# status = max(dev_status, ustatus) - -# if not dev_status: - - # Decide which of user's and device's levels should be used according to the setting # "device_levels_handling". Result is four variables: {warn,crit}{,_lower} dlh = params.get("device_levels_handling", "usrdefault") @@ -215,7 +200,7 @@ def check_temperature(reading, params, dev_unit = "c", perfdata = [ ("temp", temp, warn, crit, warn_lower, crit_lower) ] # Render actual temperature, e.g. "17.8 °F" - infotext = "%s %s" % (render_temp(temp), unitsym[output_unit]) + infotext = "%s %s" % (render_temp(temp, output_unit), temp_unitsym[output_unit]) if dev_status != None and dev_status_name: infotext += ", %s" % dev_status_name @@ -229,27 +214,27 @@ def check_temperature(reading, params, dev_unit = "c", if usr_levels: usr_levelstext = " (warn/crit at %s/%s %s)" % ( - render_temp(usr_warn), - render_temp(usr_crit), - unitsym[output_unit]) + render_temp(usr_warn, output_unit), + render_temp(usr_crit, output_unit), + temp_unitsym[output_unit]) if usr_levels_lower: usr_levelstext_lower = " (warn/crit below %s/%s %s)" % ( - render_temp(usr_warn_lower), - render_temp(usr_crit_lower), - unitsym[output_unit]) + render_temp(usr_warn_lower, output_unit), + render_temp(usr_crit_lower, output_unit), + temp_unitsym[output_unit]) if dev_levels: dev_levelstext = " (device warn/crit at %s/%s %s)" % ( - render_temp(dev_warn), - render_temp(dev_crit), - unitsym[output_unit]) + render_temp(dev_warn, output_unit), + render_temp(dev_crit, output_unit), + temp_unitsym[output_unit]) if dev_levels_lower: dev_levelstext_lower = " (device warn/crit below %s/%s %s)" % ( - render_temp(dev_warn_lower), - render_temp(dev_crit_lower), - unitsym[output_unit]) + render_temp(dev_warn_lower, output_unit), + render_temp(dev_crit_lower, output_unit), + temp_unitsym[output_unit]) # Output only levels that are relevant when computing the state if dlh == "usr": @@ -276,3 +261,61 @@ def check_temperature(reading, params, dev_unit = "c", infotext += dev_levelstext_lower return status, infotext, perfdata + + +def check_temperature_list(sensorlist, params): + + if type(params) == tuple: + params = { "levels" : params } + elif type(params) == None: + params = {} + + output_unit = params.get("output_unit", "c") + + def worststate(a, b): + if a != 3 and b != 3: + return max(a,b) + elif a != 2 and b != 2: + return 3 + else: + return 2 + + if sensorlist == []: + return + + sensor_count = len(sensorlist) + tempsum = 0 + tempmax = sensorlist[0][1] + tempmin = sensorlist[0][1] + status = 0 + detailtext = "" + for entry in sensorlist: + + if len(entry) == 2: + sub_item, temp = entry + kwargs = {} + else: + sub_item, temp, kwargs = entry + if type(temp) not in [ float, int ]: + temp = float(temp) + + tempsum += temp + tempmax = max(tempmax, temp) + tempmin = min(tempmin, temp) + sub_status, sub_infotext, sub_perfdata = check_temperature(temp, params, **kwargs) + status = worststate(status, sub_status) + if status != 0: + detailtext += (sub_item + ": " + sub_infotext + state_markers[sub_status] + ", ") + if detailtext: + detailtext = " " + detailtext[:-2] # Drop trailing ", ", add space to join with summary + + unitsym = temp_unitsym[output_unit] + tempavg = tempsum / float(sensor_count) + summarytext = "%d Sensors; Highest: %s %s, Average: %s %s, Lowest: %s %s" % ( sensor_count, + render_temp(tempmax, output_unit), unitsym, + render_temp(tempavg, output_unit), unitsym, + render_temp(tempmin, output_unit), unitsym ) + infotext = summarytext + detailtext + perfdata = [ ("temp", tempmax) ] + + return status, infotext, perfdata

9 years, 4 months

Check_MK Git: check_mk: netapp_api_temp: Reworked to use new check_temperature_list function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 55a4c5b892a164d75016d85915c332189fdea97c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55a4c5b892a164… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 24 16:18:31 2015 +0100 netapp_api_temp: Reworked to use new check_temperature_list function Conflicts: checks/netapp_api_temp --- checks/netapp_api_temp | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/checks/netapp_api_temp b/checks/netapp_api_temp index 1029f3c..80ee94d 100644 --- a/checks/netapp_api_temp +++ b/checks/netapp_api_temp @@ -41,10 +41,7 @@ def inventory_netapp_api_temp(parsed): def check_netapp_api_temp(item, params, parsed): is_ambient = item == "Ambient" and "true" or "false" - sensor_count = 0 - sum_temp = 0.0 - - sensor_errors = [] + sensorlist = [] for shelf, sensors in parsed.items(): if sensors["shelf-owned"][0] != "true": continue @@ -53,30 +50,21 @@ def check_netapp_api_temp(item, params, parsed): if ambient != is_ambient: continue - sensor_count += 1 current_temp = int(sensors["temp-sensor-current-temperature"][idx]) - sum_temp += current_temp - if sensor_count == 1: - lowest_temp = current_temp - highest_temp = current_temp - else: - lowest_temp = min(lowest_temp, current_temp) - highest_temp = max(highest_temp, current_temp) - sensor_no = sensors["temp-sensor-element-no"][idx] warn_low = int(sensors["temp-sensor-low-warning"][idx]) crit_low = int(sensors["temp-sensor-low-critical"][idx]) warn_high = int(sensors["temp-sensor-hi-warning"][idx]) crit_high = int(sensors["temp-sensor-hi-critical"][idx]) - state, infotext, perfdata = check_temperature(current_temp, params, - dev_levels=(warn_high, crit_high), dev_levels_lower=(warn_low, crit_low)) - if state: - yield state, ("Sensor %s at " % sensor_no) + infotext - if sensor_count > 0: - yield 0, "%d Temperature sensors, highest: %.1f °C, average: %.1f °C lowest: %.1f °C" % ( - sensor_count, highest_temp, sum_temp / sensor_count, lowest_temp), [ ("temp", highest_temp) ] + kwargs = { + "dev_levels" : (warn_high, crit_high), + "dev_levels_lower" : (warn_low, crit_low), + } + + sensorlist.append( (shelf + "/" + sensor_no, current_temp, kwargs) ) + return check_temperature_list(sensorlist, params) check_info["netapp_api_temp"] = {

9 years, 4 months

← Newer
1
2
3
4
5
6
7
8
9
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015