Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: #1373 SEC Do not ouput complete command line when datasource programs fail

by Mathias Kettner

Module: check_mk Branch: master Commit: 953c2b1734b2ff472a956db5fd9caf331f327294 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=953c2b1734b2ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 21 13:12:42 2014 +0200 #1373 SEC Do not ouput complete command line when datasource programs fail When executing a datasource program like <tt>agent_vsphere</tt> fails, then Check_MK used to output the complete command line as plugin output of the Check_MK active check as part of an error message. The commandline could contain passwords - however. So this has now been changed into just outputting the path to the executable (e.g. <tt>/omd/sites/mysite/share/check_mk/agents/special/agent_vsphere</tt>). --- .werks/1373 | 15 +++++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 6 ++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/1373 b/.werks/1373 new file mode 100644 index 0000000..07d43d4 --- /dev/null +++ b/.werks/1373 @@ -0,0 +1,15 @@ +Title: Do not ouput complete command line when datasource programs fail +Level: 2 +Component: core +Class: security +Compatible: compat +State: unknown +Version: 1.2.5i6 +Date: 1408619422 + +When executing a datasource program like <tt>agent_vsphere</tt> +fails, then Check_MK used to output the complete command line +as plugin output of the Check_MK active check as part of an error +message. The commandline could contain passwords - however. So this +has now been changed into just outputting the path to the executable +(e.g. <tt>/omd/sites/mysite/share/check_mk/agents/special/agent_vsphere</tt>). diff --git a/ChangeLog b/ChangeLog index 17f90eb..cf9109b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.5i6: Core & Setup: * 1008 Overall check timeout for Check_MK checks now defaults to CRIT state... + * 1373 SEC: Do not ouput complete command line when datasource programs fail... Checks & Agents: * 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7d2277e..cd01442 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -656,6 +656,8 @@ def get_agent_info(hostname, ipaddress, max_cache_age): # Get data in case of external program def get_agent_info_program(commandline): + exepath = commandline.split()[0] # for error message, hide options! + import subprocess if opt_verbose: sys.stderr.write("Calling external program %s\n" % commandline) @@ -664,11 +666,11 @@ def get_agent_info_program(commandline): stdout, stderr = p.communicate() exitstatus = p.returncode except Exception, e: - raise MKAgentError("Could not execute '%s': %s" % (commandline, e)) + raise MKAgentError("Could not execute '%s': %s" % (exepath, e)) if exitstatus: if exitstatus == 127: - raise MKAgentError("Program '%s' not found (exit code 127)" % (commandline,)) + raise MKAgentError("Program '%s' not found (exit code 127)" % exepath) else: raise MKAgentError("Agent exited with code %d: %s" % (exitstatus, stderr)) return stdout

10 years, 1 month

Check_MK Git: check_mk: #1372 cisco_vss: new check for monitoring state of Cisco Virtual Switches

by Mathias Kettner

Module: check_mk Branch: master Commit: 51a81970fee25c757a28492c9c499efac6c84d61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51a81970fee25c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 21 12:17:09 2014 +0200 #1372 cisco_vss: new check for monitoring state of Cisco Virtual Switches --- .werks/1372 | 9 ++++ ChangeLog | 1 + checkman/cisco_vss | 13 ++++++ checks/cisco_vss | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+) diff --git a/.werks/1372 b/.werks/1372 new file mode 100644 index 0000000..8b0b8d6 --- /dev/null +++ b/.werks/1372 @@ -0,0 +1,9 @@ +Title: cisco_vss: new check for monitoring state of Cisco Virtual Switches +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408616211 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index dad3a26..17f90eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * 0646 brocade_fcport: the administrative states for which ports are inventorized can now be configured in WATO * 1010 chrony: new check for NTP synchronization via chrony on Linux... * 1011 ibm_svc_systemstats.disk_latency: introduce levels for alerting... + * 1372 cisco_vss: new check for monitoring state of Cisco Virtual Switches * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checkman/cisco_vss b/checkman/cisco_vss new file mode 100644 index 0000000..24d593c --- /dev/null +++ b/checkman/cisco_vss @@ -0,0 +1,13 @@ +title: Cisco switches: State of Virtual Switches +agents: snmp +catalog: hw/network/cisco +license: GPL +distribution: check_mk +description: + This check monitors the state of Virtual Switches formed by two Cisco Catalyst + 45XX or 65XX switches. It makes sure that both switches are not in standalone + mode and that all configured VSL links are up. + +inventory: + A service is created if at least one chassis is in standby or active mode. + diff --git a/checks/cisco_vss b/checks/cisco_vss new file mode 100644 index 0000000..472aa4e --- /dev/null +++ b/checks/cisco_vss @@ -0,0 +1,129 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Example SNMP walk (extract) +# All names OIDs are prefixed with CISCO-VIRTUAL-SWITCH-MIB:: +# All numeric OIDs are prefixed with .1.3.6.1.4.1.9.9.388 + +# cvsDomain.0 .1.1.1.0 10 +# cvsSwitchID.0 .1.1.2.0 1 +# cvsSwitchCapability.0 .1.1.3.0 "C0 " +# cvsSwitchMode.0 .1.1.4.0 2 +# cvsSwitchConvertingStatus.0 .1.1.5.0 2 +# cvsVSLChangeNotifEnable.0 .1.1.6.0 2 +# cvsCoreSwitchPriority.1 .1.2.1.1.2.1 100 +# cvsCoreSwitchPriority.2 .1.2.1.1.2.2 100 +# cvsCoreSwitchPreempt.1 .1.2.1.1.3.1 2 +# cvsCoreSwitchPreempt.2 .1.2.1.1.3.2 2 +# cvsCoreSwitchLocation.1 .1.2.1.1.4.1 +# cvsCoreSwitchLocation.2 .1.2.1.1.4.2 +# cvsChassisSwitchID.2 .1.2.2.1.1.2 1 +# cvsChassisSwitchID.500 .1.2.2.1.1.500 2 +# cvsChassisRole.2 .1.2.2.1.2.2 2 +# cvsChassisRole.500 .1.2.2.1.2.500 3 +# cvsChassisUpTime.2 .1.2.2.1.3.2 184371004 +# cvsChassisUpTime.500 .1.2.2.1.3.500 184371004 +# cvsVSLCoreSwitchID.41 .1.3.1.1.2.41 1 +# cvsVSLCoreSwitchID.42 .1.3.1.1.2.42 2 +# cvsVSLConnectOperStatus.41 .1.3.1.1.3.41 1 +# cvsVSLConnectOperStatus.42 .1.3.1.1.3.42 1 +# cvsVSLLastConnectionStateChange.41 .1.3.1.1.4.41 "07 DE 07 18 01 12 22 00 " +# cvsVSLLastConnectionStateChange.42 .1.3.1.1.4.42 "07 DE 07 18 01 12 22 00 " +# cvsVSLConfiguredPortCount.41 .1.3.1.1.5.41 2 +# cvsVSLConfiguredPortCount.42 .1.3.1.1.5.42 2 +# cvsVSLOperationalPortCount.41 .1.3.1.1.6.41 2 +# cvsVSLOperationalPortCount.42 .1.3.1.1.6.42 2 +# cvsVSLConnectionRowStatus.41 .1.3.1.1.7.41 1 +# cvsVSLConnectionRowStatus.42 .1.3.1.1.7.42 1 +# cvsModuleVSSupported.1000 .1.4.1.1.1.1000 1 +# cvsModuleVSSupported.11000 .1.4.1.1.1.11000 1 +# cvsModuleVSLCapable.1000 .1.4.1.1.2.1000 1 +# cvsModuleVSLCapable.11000 .1.4.1.1.2.11000 1 +# cvsModuleSlotNumber.1000 .1.4.1.1.3.1000 1 +# cvsModuleSlotNumber.11000 .1.4.1.1.3.11000 11 +# cvsModuleRprWarm.1000 .1.4.1.1.4.1000 1 +# cvsModuleRprWarm.11000 .1.4.1.1.4.11000 1 +# cvsDualActiveDetectionNotifEnable.0 .1.5.1.0 2 + +cisco_vss_role_names = { + '1' : 'standalone', + '2' : 'active', + '3' : 'standby', +} + +cisco_vss_operstatus_names = { + '1' : 'up', + '2' : 'down', +} + +def inventory_cisco_vss(info): + import pprint ; pprint.pprint(info) + for switch_id, chassis_role in info[0]: + if chassis_role in [ '2', '3' ]: # active, standby + return [ (None, None) ] + +def check_cisco_vss(item, params, info): + chassis, ports = info + for switch_id, chassis_role in chassis: + if chassis_role == '1': + state = 2 + else: + state = 0 + yield state, "switch %s: %s" % (switch_id, cisco_vss_role_names[chassis_role]) + + yield 0, "%d VLS connections configured" % len(ports) + + for core_switch_id, operstatus in ports: + if operstatus == '1': + state = 0 + else: + state = 2 + yield state, "port %s: %s" % (core_switch_id, cisco_vss_operstatus_names[operstatus]) + + +check_info["cisco_vss"] = { + "check_function" : check_cisco_vss, + "inventory_function" : inventory_cisco_vss, + "service_description": "VSS Status", + "snmp_scan_function" : lambda oid: ( + "Catalyst 45" in oid(".1.3.6.1.2.1.1.1.0") or + "Catalyst 65" in oid(".1.3.6.1.2.1.1.1.0")) and \ + oid(".1.3.6.1.4.1.9.9.388.1.1.1.0"), + "snmp_info" : [ + ( ".1.3.6.1.4.1.9.9.388.1.2.2.1", + [ + 1, # cvsChassisSwitchID + 2, # cvsChassisRole: standalone(1), active(2), standby(3) + ] + ), + ( ".1.3.6.1.4.1.9.9.388.1.3.1.1", + [ + 2, # cvsVSLCoreSwitchID + 3, # cvsVSLConnectOperStatus: up(1), down(2) + ] + ), + ], +}

10 years, 1 month

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: cd5b00f393fd620a9f0e353bc72f6a9586e1c862 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd5b00f393fd62… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 21 12:16:43 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4adbd2b..b6e4b18 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1372 +1382

10 years, 1 month

Check_MK Git: check_mk: #1155 NagVis map edit/ view permissions can now be set using roles

by Lars Michelsen

Module: check_mk Branch: master Commit: b0c726668faf9935a11c9e480195215fa7c29e19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0c726668faf99… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 21 10:24:39 2014 +0200 #1155 NagVis map edit/view permissions can now be set using roles The view and edit permissions of specific NagVis maps of the local NagVis installation can now be managed using multisite roles. Each role can get individual read / modify permissions assigned for each NagVis map. This feature is only available in OMD environments. --- .werks/1155 | 14 ++++++++++++++ ChangeLog | 1 + web/plugins/wato/nagvis_auth.py | 36 ++++++++++++++++++++++++++++++------ 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/.werks/1155 b/.werks/1155 new file mode 100644 index 0000000..8524fb4 --- /dev/null +++ b/.werks/1155 @@ -0,0 +1,14 @@ +Title: NagVis map edit/view permissions can now be set using roles +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1408609367 +Class: feature + +The view and edit permissions of specific NagVis maps of the local +NagVis installation can now be managed using multisite roles. Each +role can get individual read / modify permissions assigned for each +NagVis map. + +This feature is only available in OMD environments. diff --git a/ChangeLog b/ChangeLog index c9d4a7a..f977d72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ WATO: * 1096 New WATO webservices: manage hosts via webinterface... + * 1155 NagVis map edit/view permissions can now be set using roles... * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... * 1089 FIX: Snapshot restore: fixed exception during exception handling...... * 1091 FIX: logwatch patterns: allow unicode text in pattern comment diff --git a/web/plugins/wato/nagvis_auth.py b/web/plugins/wato/nagvis_auth.py index d3d66cc..a91f53c 100644 --- a/web/plugins/wato/nagvis_auth.py +++ b/web/plugins/wato/nagvis_auth.py @@ -36,16 +36,16 @@ config.declare_permission( ) config.declare_permission( - 'nagvis.Map_view_*', - _('View all maps'), - _('Grants read access to all maps.'), + 'nagvis.Rotation_view_*', + _('Use all map rotations'), + _('Grants read access to all rotations.'), [ 'guest' ] ) config.declare_permission( - 'nagvis.Rotation_view_*', - _('Use all map rotations'), - _('Grants read access to all rotations.'), + 'nagvis.Map_view_*', + _('View all maps'), + _('Grants read access to all maps.'), [ 'guest' ] ) @@ -62,3 +62,27 @@ config.declare_permission( _('Permits to delete all maps.'), [] ) + +# Find all NagVis maps in the local installation to register permissions +# for each map. When no maps can be found skip this problem silently. +# This only works in OMD environments. + +if defaults.omd_root: + nagvis_maps_path = defaults.omd_root + '/etc/nagvis/maps' + for f in os.listdir(nagvis_maps_path): + if f[0] != '.' and f.endswith('.cfg'): + map_name = f[:-4] + + config.declare_permission( + 'nagvis.Map_view_%s' % map_name, + _('Map %s: view') % map_name, + _('Grants read access to the NagVis map %s.') % map_name, + [ 'guest' ] + ) + + config.declare_permission( + 'nagvis.Map_edit_%s' % map_name, + _('Map %s: edit') % map_name, + _('Grants modify access to the NagVis map %s.') % map_name, + [ ] + )

10 years, 1 month

Check_MK Git: check_mk: #1011 ibm_svc_systemstats.disk_latency: introduce levels for alerting

by Mathias Kettner

Module: check_mk Branch: master Commit: c41ffe77e51e2ee5a1b4c2467e8cef92ddd51406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c41ffe77e51e2e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 21 10:20:01 2014 +0200 #1011 ibm_svc_systemstats.disk_latency: introduce levels for alerting This check was currently always OK. Now you can optionally set fixed or predictive levels. --- .werks/1011 | 11 +++++++++++ ChangeLog | 1 + checks/ibm_svc_nodestats | 3 +++ checks/ibm_svc_systemstats | 26 +++++++++++++++++++------- web/plugins/wato/check_parameters.py | 31 +++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 7 deletions(-) diff --git a/.werks/1011 b/.werks/1011 new file mode 100644 index 0000000..15ba0d8 --- /dev/null +++ b/.werks/1011 @@ -0,0 +1,11 @@ +Title: ibm_svc_systemstats.disk_latency: introduce levels for alerting +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408609145 +Class: feature + +This check was currently always OK. Now you can optionally set fixed +or predictive levels. + diff --git a/ChangeLog b/ChangeLog index c9d4a7a..ece018f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 1006 printer_pages: add Perf-O-Meter and PNP template * 0646 brocade_fcport: the administrative states for which ports are inventorized can now be configured in WATO * 1010 chrony: new check for NTP synchronization via chrony on Linux... + * 1011 ibm_svc_systemstats.disk_latency: introduce levels for alerting... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checks/ibm_svc_nodestats b/checks/ibm_svc_nodestats index 3bebb4f..e25dc86 100644 --- a/checks/ibm_svc_nodestats +++ b/checks/ibm_svc_nodestats @@ -24,6 +24,9 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Note: This file is almost identical with ibm_svc_nodestats. We should +# create an include file for sharing common code! + # Example output from agent: # <<<ibm_svc_nodestats:sep(58)>>> # 1:BLUBBSVC01:compression_cpu_pc:0:0:140325134931 diff --git a/checks/ibm_svc_systemstats b/checks/ibm_svc_systemstats index 92ef0e1..e2b86b9 100644 --- a/checks/ibm_svc_systemstats +++ b/checks/ibm_svc_systemstats @@ -24,6 +24,9 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Note: This file is almost identical with ibm_svc_systemstats. We should +# create an include file for sharing common code! + # Example output from agent: # <<<ibm_svc_systemstats:sep(58)>>> # compression_cpu_pc:0:0:140325134929 @@ -176,26 +179,35 @@ def inventory_ibm_svc_systemstats_disk_latency(info): inventory = [] parsed = ibm_svc_systemstats_parse(info) for key in parsed.keys(): - inventory.append( (key, None) ) + inventory.append( (key, {}) ) return inventory -def check_ibm_svc_systemstats_disk_latency(item, _no_params, info): +def check_ibm_svc_systemstats_disk_latency(item, params, info): parsed = ibm_svc_systemstats_parse(info) + if item not in parsed.keys(): - return 3, "%s not found in agent output" % item + yield 3, "%s not found in agent output" % item + return + + if not params: + params = {} # Convert from previous None + + for what, latency in [ + ('read', parsed[item]['r_ms'] ), + ('write', parsed[item]['w_ms'] )]: - read_latency = parsed[item]['r_ms'] - write_latency = parsed[item]['w_ms'] - perfdata = [ ("read_latency", read_latency), ("write_latency", write_latency) ] + state, text, extraperf = check_levels(latency, what + "_latency", params.get(what), unit = "ms") + yield state, ("Latency is %.1f ms for %s" % (latency, what)) + text, \ + [ ( what + "_latency", latency) ] + extraperf - return 0, "Latency is %s ms for read, %s ms for write" % (read_latency, write_latency), perfdata check_info["ibm_svc_systemstats.disk_latency"] = { "check_function" : check_ibm_svc_systemstats_disk_latency, "inventory_function" : inventory_ibm_svc_systemstats_disk_latency, "service_description" : "IBM SVC Latency %s Total", "has_perfdata" : True, + "group" : "ibm_svc_total_latency", } #. diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 071b105..0142651 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3814,6 +3814,37 @@ register_check_parameters( register_check_parameters( subgroup_storage, + "ibm_svc_total_latency", + _("IBM SVC: Levels for total disk latency"), + Dictionary( + elements = [ + ( "read", + Levels( + title = _("Read throughput"), + unit = _("MB/s"), + default_value = None, + default_levels = (50.0, 100.0))), + ( "write", + Levels( + title = _("Write throughput"), + unit = _("MB/s"), + default_value = None, + default_levels = (50.0, 100.0))), + ] + ), + DropdownChoice( + choices = [ ( "Drives", _("Total latency for all drives") ), + ( "MDisks", _("Total latency for all MDisks") ), + ( "VDisks", _("Total latency for all VDisks") ), + ], + title = _("Disk/Drive type"), + help = _("Please enter <tt>Drives</tt>, <tt>Mdisks</tt> or <tt>VDisks</tt> here.")), + "first" +) + + +register_check_parameters( + subgroup_storage, "disk_io", _("Levels on disk IO (throughput)"), Dictionary(

10 years, 1 month

Check_MK Git: check_mk: Minor optical fix in output of predictive monitory

by Mathias Kettner

Module: check_mk Branch: master Commit: 9cb0e2d6562f98c3a488e420fff8c3bbb06af6a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cb0e2d6562f98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 21 10:17:14 2014 +0200 Minor optical fix in output of predictive monitory --- modules/check_mk_base.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 68a1385..7d2277e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1603,7 +1603,7 @@ def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemar unit = " " + unit # Insert space before MB, GB, etc. perfdata = [] - infotext = "" + infotexts = [] # None or (None, None) -> do not check any levels if params == None or params == (None, None): @@ -1621,9 +1621,9 @@ def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemar ref_value, ((warn_upper, crit_upper), (warn_lower, crit_lower)) = \ get_predictive_levels(dsname, params, "MAX", levels_factor=factor * scale) if ref_value: - infotext += "predicted reference: %.2f%s" % (ref_value * factor / scale, unit) + infotexts.append("predicted reference: %.2f%s" % (ref_value * factor / scale, unit)) else: - infotext += "no reference for prediction yet" + infotexts.append("no reference for prediction yet") except Exception, e: if opt_debug: raise @@ -1635,23 +1635,28 @@ def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemar # Critical cases if crit_upper != None and value >= crit_upper: state = 2 - infotext += " (critical level at %.2f%s)" % (crit_upper / factor / scale, unit) + infotexts.append("critical level at %.2f%s" % (crit_upper / factor / scale, unit)) elif crit_lower != None and value <= crit_lower: state = 2 - infotext += " (too low: critical level at %.2f%s)" % (crit_lower / factor / scale, unit) + infotexts.append("too low: critical level at %.2f%s" % (crit_lower / factor / scale, unit)) # Warning cases elif warn_upper != None and value >= warn_upper: state = 1 - infotext += " (warning level at %.2f%s)" % (warn_upper / factor / scale, unit) + infotexts.append("warning level at %.2f%s" % (warn_upper / factor / scale, unit)) elif warn_lower != None and value <= warn_lower: state = 1 - infotext += " (too low: warning level at %.2f%s)" % (warn_lower / factor / scale, unit) + infotexts.append("too low: warning level at %.2f%s" % (warn_lower / factor / scale, unit)) # OK else: state = 0 + if infotexts: + infotext = " (" + ", ".join(infotexts) + ")" + else: + infotext = "" + if state and statemarkers: if state == 1: infotext += "(!)"

10 years, 1 month

Check_MK Git: check_mk: #1145 FIX windows_tasks: handle case correctly where task is currently running

by Mathias Kettner

Module: check_mk Branch: master Commit: 6df4372aed7b8bb3cd3c17673138716a67a90969 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6df4372aed7b8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 20 17:41:19 2014 +0200 #1145 FIX windows_tasks: handle case correctly where task is currently running In some cases a Windows task reports state 267009. That was reported as {CRIT} but in fact means that the task is currently running. It is reported as {OK} now. --- .werks/1145 | 11 +++++++++++ ChangeLog | 1 + checks/windows_tasks | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/1145 b/.werks/1145 new file mode 100644 index 0000000..00a903e --- /dev/null +++ b/.werks/1145 @@ -0,0 +1,11 @@ +Title: windows_tasks: handle case correctly where task is currently running +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408549221 +Class: fix + +In some cases a Windows task reports state 267009. That was reported as {CRIT} but +in fact means that the task is currently running. It is reported as {OK} now. + diff --git a/ChangeLog b/ChangeLog index 5fc97a5..c9d4a7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * 1143 FIX: dell_powerconnect_temp: fix configuration via WATO... * 1144 FIX: blade_bx_temp, dell_chassis_temp, emerson_temp, ibm_svc_enclosurestats, ups_bat_temp: rename service description... NOTE: Please refer to the migration notes! + * 1145 FIX: windows_tasks: handle case correctly where task is currently running... Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/windows_tasks b/checks/windows_tasks index 46aca6b..2e0c7d6 100644 --- a/checks/windows_tasks +++ b/checks/windows_tasks @@ -65,10 +65,12 @@ def check_windows_tasks(item, _no_params, info): state = 0 label = "" msg = [] - if last_result != 0: + if last_result not in [ 0, 0x00041301 ]: # SCHED_S_TASK_RUNNING state = 2 label = "(!!)" msg.append("Service in state: %s%s" % ( last_result, label ) ) + if last_result == 0x00041301: + msg[-1] += " (currently running)" if values['Scheduled Task State'] != 'Enabled': msg.append("Task not Enabled(!!)")

10 years, 1 month

Check_MK Git: check_mk: #1144 FIX blade_bx_temp, dell_chassis_temp, emerson_temp, ibm_svc_enclosurestats, ups_bat_temp:

by Mathias Kettner

rename service description Message-ID: <53f4be9c.Wpndd3oelJFOpXth%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 27d0ae247b7985327450175ec51951002c2c142f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27d0ae247b7985… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 20 17:28:20 2014 +0200 #1144 FIX blade_bx_temp, dell_chassis_temp, emerson_temp, ibm_svc_enclosurestats, ups_bat_temp: rename service description Rename service description of these checks. They now all begin with <tt>Temperature</tt>, such as is custom for all Check_MK checks. Beware: new graphs will be created. If these services are target of WATO or BI rules you might need to adjust them. Your WATO configuration for levels should work without change. --- .werks/1144 | 12 ++++++++++++ ChangeLog | 2 ++ checks/blade_bx_temp | 2 +- checks/dell_chassis_temp | 2 +- checks/emerson_temp | 2 +- checks/ibm_svc_enclosurestats | 2 +- checks/ups_bat_temp | 2 +- 7 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.werks/1144 b/.werks/1144 new file mode 100644 index 0000000..75e5834 --- /dev/null +++ b/.werks/1144 @@ -0,0 +1,12 @@ +Title: blade_bx_temp, dell_chassis_temp, emerson_temp, ibm_svc_enclosurestats, ups_bat_temp: rename service description +Level: 2 +Component: checks +Compatible: incomp +Version: 1.2.5i6 +Date: 1408548365 +Class: fix + +Rename service description of these checks. They now all begin with <tt>Temperature</tt>, such as +is custom for all Check_MK checks. Beware: new graphs will be created. If these services are target +of WATO or BI rules you might need to adjust them. Your WATO configuration for levels should work +without change. diff --git a/ChangeLog b/ChangeLog index 50429df..5fc97a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,8 @@ * 1009 FIX: df: deal with space in file system type for PlayStation file system... * 1098 FIX: esx_vsphere_counters.diskio: Now reports unknown when counter data is missing * 1143 FIX: dell_powerconnect_temp: fix configuration via WATO... + * 1144 FIX: blade_bx_temp, dell_chassis_temp, emerson_temp, ibm_svc_enclosurestats, ups_bat_temp: rename service description... + NOTE: Please refer to the migration notes! Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/blade_bx_temp b/checks/blade_bx_temp index 72a0a97..13d2244 100644 --- a/checks/blade_bx_temp +++ b/checks/blade_bx_temp @@ -63,7 +63,7 @@ def check_blade_bx_temp(item, params, info): check_info['blade_bx_temp'] = { "check_function" : check_blade_bx_temp, "inventory_function" : lambda info: [ (line[2], None) for line in info if int(line[1]) != 7] , - "service_description" : "Blade Temp %s", + "service_description" : "Temperature Blade %s", "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.3.4.1.1", [ 1, # index diff --git a/checks/dell_chassis_temp b/checks/dell_chassis_temp index 35a0be0..0185555 100644 --- a/checks/dell_chassis_temp +++ b/checks/dell_chassis_temp @@ -67,7 +67,7 @@ def check_dell_chassis_temp(item, params, info): check_info["dell_chassis_temp"] = { "check_function" : check_dell_chassis_temp, "inventory_function" : inventory_dell_chassis_temp, - "service_description" : "%s Temperature", + "service_description" : "Temperature %s", "has_perfdata" : True, "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.4.1.674.10892.2.3.1", [ diff --git a/checks/emerson_temp b/checks/emerson_temp index a31f017..355057c 100644 --- a/checks/emerson_temp +++ b/checks/emerson_temp @@ -60,7 +60,7 @@ def check_emerson_temp(item, params, info): check_info['emerson_temp'] = { "inventory_function" : inventory_emerson_temp, "check_function" : check_emerson_temp, - "service_description" : "Temperature", + "service_description" : "Temperature %s", "has_perfdata" : True, "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.4.1.6302.2.1.2", ["7"] ), diff --git a/checks/ibm_svc_enclosurestats b/checks/ibm_svc_enclosurestats index 4483a54..6b2f72f 100644 --- a/checks/ibm_svc_enclosurestats +++ b/checks/ibm_svc_enclosurestats @@ -78,7 +78,7 @@ def check_ibm_svc_enclosurestats_temp(item, params, info): check_info["ibm_svc_enclosurestats.temp"] = { "check_function" : check_ibm_svc_enclosurestats_temp, "inventory_function" : inventory_ibm_svc_enclosurestats_temp, - "service_description" : "IBM SVC Temperature Enclosure %s", + "service_description" : "Temperature Enclosure %s", "has_perfdata" : True, "group" : "hw_temperature", } diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 068c320..044b818 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -52,7 +52,7 @@ def check_ups_bat_temp(item, params, info): check_info['ups_bat_temp'] = { "inventory_function" : inventory_ups_bat_temp, "check_function" : check_ups_bat_temp, - "service_description" : "Temperature Battery", + "service_description" : "Temperature Battery %s", "has_perfdata" : True, "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.2.1.33.1", ["1.5", "2.7" ] ),

10 years, 1 month

Check_MK Git: check_mk: #1143 FIX dell_powerconnect_temp: fix configuration via WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 75cb6df2d77f1780c29c7539711660a3529ff860 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75cb6df2d77f17… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 20 17:25:47 2014 +0200 #1143 FIX dell_powerconnect_temp: fix configuration via WATO When configuring levels via the rule Hardware temperature the levels would not work for this check type. The reason is that - unless most of the other check plugins for hardware temperature - this check only supports a single sensor. Therefor a new ruleset has been created named Hardware temperature, single sensor. Please use that for configuration. --- .werks/1143 | 13 +++++++++++++ ChangeLog | 2 +- checks/dell_powerconnect_temp | 4 ++-- web/plugins/wato/check_parameters.py | 17 ++++++++++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.werks/1143 b/.werks/1143 new file mode 100644 index 0000000..fa75fc7 --- /dev/null +++ b/.werks/1143 @@ -0,0 +1,13 @@ +Title: dell_powerconnect_temp: fix configuration via WATO +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408548253 +Class: fix + +When configuring levels via the rule Hardware temperature the levels would not +work for this check type. The reason is that - unless most of the other check plugins +for hardware temperature - this check only supports a single sensor. Therefor a new +ruleset has been created named Hardware temperature, single sensor. Please use +that for configuration. diff --git a/ChangeLog b/ChangeLog index 5ed2703..50429df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 1097 FIX: windows_agent: preventing missing agent sections on first query... * 1009 FIX: df: deal with space in file system type for PlayStation file system... * 1098 FIX: esx_vsphere_counters.diskio: Now reports unknown when counter data is missing + * 1143 FIX: dell_powerconnect_temp: fix configuration via WATO... Multisite: * 1066 Implemented Dashboard Designer... @@ -50,7 +51,6 @@ * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... WATO: - * 1095 New WATO Web-API: Now able to manage hosts via web automation calls * 1096 New WATO webservices: manage hosts via webinterface... * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... * 1089 FIX: Snapshot restore: fixed exception during exception handling...... diff --git a/checks/dell_powerconnect_temp b/checks/dell_powerconnect_temp index 4eb0151..fb57692 100644 --- a/checks/dell_powerconnect_temp +++ b/checks/dell_powerconnect_temp @@ -56,7 +56,7 @@ def inventory_dell_powerconnect_temp(checkname, info): return inventory # Execute a check against each sensor. -def check_dell_powerconnect_temp(item, params, info): +def check_dell_powerconnect_temp(_no_item, params, info): warn, crit = params sensor_info = "" temp_info = "" @@ -96,5 +96,5 @@ check_info["dell_powerconnect_temp"] = { 'snmp_info': ('.1.3.6.1.4.1.89.53.15.1', ['9', '10']), 'snmp_scan_function': \ lambda oid: ".1.3.6.1.4.1.674.10895" in oid(".1.3.6.1.2.1.1.2.0"), - 'group': 'hw_temperature', + 'group': 'hw_temperature_single', } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ccd3a91..071b105 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4459,7 +4459,7 @@ register_check_parameters( register_check_parameters( subgroup_environment, "hw_temperature", - _("Hardware temperature (e.g. switches)"), + _("Hardware temperature, multiple sensors"), Tuple( help = _("Temperature levels for hardware devices like " "Brocade switches with (potentially) several " @@ -4477,6 +4477,21 @@ register_check_parameters( register_check_parameters( subgroup_environment, + "hw_temperature_single", + _("Hardware temperature, single sensor"), + Tuple( + help = _("Temperature levels for hardware devices like " + "DELL Powerconnect that have just one temperature sensor. "), + elements = [ + Integer(title = _("warning if above"), unit = u"°C", default_value = 35), + Integer(title = _("critical if above"), unit = u"°C", default_value = 40), + ]), + None, + "first" +) + +register_check_parameters( + subgroup_environment, "disk_temperature", _("Harddisk temperature (e.g. via SMART)"), Tuple(

10 years, 1 month

Check_MK Git: check_mk: Dashboards: URL dashlets can now reference to a python function which generates the url dynamically

by Lars Michelsen

Module: check_mk Branch: master Commit: 0bc7a8f1a5359f8ca093ce21b9f8dfb6103ad6b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bc7a8f1a5359f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 20 14:05:00 2014 +0200 Dashboards: URL dashlets can now reference to a python function which generates the url dynamically --- web/htdocs/dashboard.py | 26 +++++++++++++++++++++++++- web/plugins/dashboard/dashlets.py | 5 +++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index d742fb3..6051110 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -116,6 +116,11 @@ def transform_builtin_dashboards(): dashlet['type'] = dashlet['url'][8:-3] del dashlet['url'] + elif dashlet.get('urlfunc') and type(dashlet['urlfunc']) != str: + raise MKGeneralException(_('Unable to transform dashlet %d of dashboard %s: ' + 'the dashlet is using "urlfunc" which can not be ' + 'converted automatically.') % (nr, name)) + elif dashlet.get('url', '') != '' or dashlet.get('urlfunc') or dashlet.get('iframe'): # Normal URL based dashlet dashlet['type'] = 'url' @@ -292,7 +297,26 @@ def render_dashboard(name): # dashlets using the 'urlfunc' method will dynamically compute # an url (using HTML context variables at their wish). if "urlfunc" in dashlet: - dashlet["url"] = dashlet["urlfunc"]() + urlfunc = dashlet['urlfunc'] + # We need to support function pointers to be compatible to old dashboard plugin + # based definitions. The new dashboards use strings to reference functions within + # the global context or functions of a module. An example would be: + # + # urlfunc: "my_custom_url_rendering_function" + # + # or within a module: + # + # urlfunc: "my_module.render_my_url" + if type(urlfunc) == type(lambda x: x): + dashlet["url"] = urlfunc() + else: + if '.' in urlfunc: + module_name, func_name = urlfunc.split('.', 1) + module = __import__(module_name) + fp = module.__dict__[func_name] + else: + fp = globals()[urlfunc] + dashlet["url"] = fp() dashlet_type = dashlet_types[dashlet['type']] diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index a818c68..8e19a94 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -581,5 +581,10 @@ dashlet_types["url"] = { title = _('URL'), size = 50, )), + ("urlfunc", TextAscii( + title = _('Dynamic URL rendering function'), + size = 50, + )), ], + "opt_params": ['url', 'urlfunc'], }

10 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits