Checkmk git commits March 2014

checkmk-commits@lists.checkmk.com

6 participants
183 discussions

Check_MK Git: check_mk: kentix_temp, kentix_humidity: new checks for Kentix MultiSensor-Rack

by Götz Golla

Module: check_mk Branch: master Commit: 8f22e40118fa844d413e8d1d1352be70c356ee5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f22e40118fa84… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Mar 25 11:57:22 2014 +0100 kentix_temp, kentix_humidity: new checks for Kentix MultiSensor-Rack --- .werks/598 | 8 +++++++ ChangeLog | 6 ++--- checkman/kentix_humidity | 13 ++++++++++ checkman/kentix_temp | 13 ++++++++++ checks/kentix_humidity | 59 ++++++++++++++++++++++++++++++++++++++++++++++ checks/kentix_temp | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 155 insertions(+), 3 deletions(-) diff --git a/.werks/598 b/.werks/598 new file mode 100644 index 0000000..73f8552 --- /dev/null +++ b/.werks/598 @@ -0,0 +1,8 @@ +Title: kentix_temp, kentix_humidity: new checks for Kentix MultiSensor-Rack +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395744987 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d7c3284..cc2d53a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,11 +121,11 @@ * 0595 dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption... * 0596 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC * 0597 dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers - * 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature... - NOTE: Please refer to the migration notes! * 0759 check_notify_count: New active check to monitor the number of notifications sent to contacts... * 0760 The windows agent contains meta information about version, manufacturer etc.... ->>>>>>> 309bc055d22c0013242e9c3787049fbd6afb6ff1 + * 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature... + NOTE: Please refer to the migration notes! + * 0598 kentix_temp, kentix_humidity: new checks for Kentix MultiSensor-Rack * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/kentix_humidity b/checkman/kentix_humidity new file mode 100644 index 0000000..8fa5874 --- /dev/null +++ b/checkman/kentix_humidity @@ -0,0 +1,13 @@ +title: Kentix MultiSensor-RACK: Humidity Sensor +agents: snmp +catalog: hw/server/kentix +license: GPL +distribution: check_mk +description: + This check monitors the humidity measured by the Kentix MultiSensor-RACK device. + + No limits are set in the check, since limits are configured in the device + itself. These limits are taken as the lower and upper warning levels of the check. + +perfdata: + One variable: the humidity diff --git a/checkman/kentix_temp b/checkman/kentix_temp new file mode 100644 index 0000000..5cbb478 --- /dev/null +++ b/checkman/kentix_temp @@ -0,0 +1,13 @@ +title: Kentix MultiSensor-RACK: Temperature Sensor +agents: snmp +catalog: hw/server/kentix +license: GPL +distribution: check_mk +description: + This check monitors the temperature measured by the Kentix MultiSensor-RACK device. + + No limits are set in the check, since limits are configured in the device + itself. These limits are taken as the lower and upper warning levels of the check. + +perfdata: + One variable: the temperature diff --git a/checks/kentix_humidity b/checks/kentix_humidity new file mode 100644 index 0000000..a47edec --- /dev/null +++ b/checks/kentix_humidity @@ -0,0 +1,59 @@ +#!/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. + +def inventory_kentix_humidity(info): + if info: + return [ (None, None ) ] + +def check_kentix_humidity(_no_item, _no_params, info): + value, lower_warn, upper_warn, alarm, text = info[0] + temp = float(value)/10 + perfdata = [ ("temp", temp, lower_warn+":"+upper_warn ) ] + upper_warn = float(upper_warn) + lower_warn = float(lower_warn) + infotext = "%.1f%% (min/max at %.1f%%/%.1f%%)" % (temp, lower_warn, upper_warn) + if temp >= upper_warn or temp <= lower_warn: + state = 1 + infotext = "%s: %s" % (text, infotext) + else: + state = 0 + return state, infotext, perfdata + +check_info["kentix_humidity"] = { + 'check_function': check_kentix_humidity, + 'inventory_function': inventory_kentix_humidity, + 'service_description': 'Humidity', + 'has_perfdata': True, + 'snmp_info': ('.1.3.6.1.4.1.37954.3.1.2', + ['1', # humidityValue + '2', # humidityMin + '3', # humidityMax + '4', # humidityAlarm, not used + '5', # humidityAlarmtext + ] + ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.332.11.6"), +} diff --git a/checks/kentix_temp b/checks/kentix_temp new file mode 100644 index 0000000..d3bd2df --- /dev/null +++ b/checks/kentix_temp @@ -0,0 +1,59 @@ +#!/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. + +def inventory_kentix_temp(info): + if info: + return [ (None, None ) ] + +def check_kentix_temp(_no_item, _no_params, info): + value, lower_warn, upper_warn, alarm, text = info[0] + temp = float(value)/10 + perfdata = [ ("temp", temp, lower_warn+":"+upper_warn ) ] + upper_warn = float(upper_warn) + lower_warn = float(lower_warn) + infotext = "%.1f C (min/max at %.1f/%.1f C)" % (temp, lower_warn, upper_warn) + if temp >= upper_warn or temp <= lower_warn: + state = 1 + infotext = "%s: %s" % (text, infotext) + else: + state = 0 + return state, infotext, perfdata + +check_info["kentix_temp"] = { + 'check_function': check_kentix_temp, + 'inventory_function': inventory_kentix_temp, + 'service_description': 'Temperature', + 'has_perfdata': True, + 'snmp_info': ('.1.3.6.1.4.1.37954.3.1.1', + ['1', # temperatureValue + '2', # temperatureMin + '3', # temperatureMax + '4', # temperatureAlarm, not used here + '5', # temperatureAlarmtext + ] + ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.332.11.6"), +}

10 years, 3 months

Check_MK Git: check_mk: ibm_svc_host: New check: Status of hosts an IBM SVC / V7000 presents volumes to

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 16305896f5fe13ffd5e2ab7f29d62b46622bc2b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16305896f5fe13… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Mar 25 11:41:57 2014 +0100 ibm_svc_host: New check: Status of hosts an IBM SVC / V7000 presents volumes to --- .werks/707 | 8 ++++ ChangeLog | 1 + checkman/ibm_svc_host | 20 ++++++++ checks/ibm_svc_host | 80 +++++++++++++++++++++++++++++++ pnp-templates/check_mk-ibm_svc_host.php | 77 +++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 31 ++++++++++++ 6 files changed, 217 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=16305896f5…

10 years, 3 months

Check_MK Git: check_mk: innovaphone_priports_l1, innovaphone_priports_l2: New Checks for Innovaphone PRI Ports

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7d8ccb0890a6611345f8a19e5d5098121805a641 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d8ccb0890a661… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Mar 25 11:34:26 2014 +0100 innovaphone_priports_l1, innovaphone_priports_l2: New Checks for Innovaphone PRI Ports --- .werks/146 | 8 ++++ ChangeLog | 1 + checkman/innovaphone_priports_l1 | 14 +++++++ checkman/innovaphone_priports_l2 | 13 +++++++ checks/innovaphone_priports_l1 | 75 ++++++++++++++++++++++++++++++++++++++ checks/innovaphone_priports_l2 | 74 +++++++++++++++++++++++++++++++++++++ 6 files changed, 185 insertions(+) diff --git a/.werks/146 b/.werks/146 new file mode 100644 index 0000000..5624a86 --- /dev/null +++ b/.werks/146 @@ -0,0 +1,8 @@ +Title: innovaphone_priports_l1, innovaphone_priports_l2: New Checks for Innovaphone PRI Ports +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395743634 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f84dfd3..97e8c37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ * 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature... NOTE: Please refer to the migration notes! * 0735 mem.win: now able to configure swap file levels + * 0146 innovaphone_priports_l1, innovaphone_priports_l2: New Checks for Innovaphone PRI Ports * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/innovaphone_priports_l1 b/checkman/innovaphone_priports_l1 new file mode 100644 index 0000000..daba5e4 --- /dev/null +++ b/checkman/innovaphone_priports_l1 @@ -0,0 +1,14 @@ +title: Innovaphone Pri L1 Gateways: Pri Ports +agents: snmp +catalog: hw/network/tel +license: GPL +distribution: check_mk +description: + This check checks the L1 pri ports of a innovaphone pri gateway like IP6010, IP3010 or IP1060. + The Check monitors the current state, Signal loss since last check and the slip error count since the + last inventory. To reset the slip error count you can eighter do a reinventory or fix the problem and reboot + the device. + +inventory: + One service for each port in state UP will be created. + diff --git a/checkman/innovaphone_priports_l2 b/checkman/innovaphone_priports_l2 new file mode 100644 index 0000000..3b92da9 --- /dev/null +++ b/checkman/innovaphone_priports_l2 @@ -0,0 +1,13 @@ +title: Innovaphone Pri L2 Gateways: Pri Ports +agents: snmp +catalog: hw/network/tel +license: GPL +distribution: check_mk +description: + This check checks the L2 pri ports of a innovaphone pri gateway like IP6010, IP3010 or IP1060. + The Check monitors the current state and the current mode. It will return a {Critical} if the + state changes to down, or the mode changes since the last inventory. + +inventory: + One service for each port in state UP will be created. + diff --git a/checks/innovaphone_priports_l1 b/checks/innovaphone_priports_l1 new file mode 100644 index 0000000..a846cce --- /dev/null +++ b/checks/innovaphone_priports_l1 @@ -0,0 +1,75 @@ +#!/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. + +def inventory_innovaphone_priports_l1(info): + inventory = [] + for line in info: + if line[1] != '1': + inventory.append((line[0], {'err_slip_count' : saveint(line[3])} )) + return inventory + +def check_innovaphone_priports_l1(item, params, info): + states = { + 1 : "Down", + 2 : "UP", + } + + for line in info: + if line[0] == item: + state = 0 + messages = [] + l1state, l1sigloss, l1slip = map(saveint, line[1:]) + state_label = "" + if l1state == 1: + state = 2 + messages.append("Current State is %s" % states[l1state] ) + else: + messages.append("State is UP") + + timedif, siglos_per_sec = get_counter("innovaphone_priports_l1." + item, time.time(), l1sigloss ) + if siglos_per_sec > 0: + state = 2 + messages.append("Signal Loss is %.2f in last %.0fsec(!!)" % ( siglos_per_sec, timedif )) + + if l1slip > params.get('err_slip_count', 0): + state = 2 + messages.append("Slip Error Count at " + str(l1slip) ) + return state, ", ".join(messages) + return 3, "Output not found" + +check_info["innovaphone_priports_l1"] = { + "check_function" : check_innovaphone_priports_l1, + "inventory_function" : inventory_innovaphone_priports_l1, + "service_description" : "Port L1 %s", + "has_perfdata" : False, + "snmp_info" : ( ".1.3.6.1.4.1.6666.1.2.1", [ 1, #l1PriLabel + 2, #l1PriState + 5, #l1PriErrSigLoss + 9, #l1PriErrSlip + ] ), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.6666", +} + diff --git a/checks/innovaphone_priports_l2 b/checks/innovaphone_priports_l2 new file mode 100644 index 0000000..d5ecba3 --- /dev/null +++ b/checks/innovaphone_priports_l2 @@ -0,0 +1,74 @@ +#!/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. + +def inventory_innovaphone_priports_l2(info): + inventory = [] + for line in info: + if line[1] != '1': + inventory.append((line[0], {'mode' : saveint(line[2])} )) + return inventory + +def check_innovaphone_priports_l2(item, params, info): + modes = { + 1 : "TE", + 2 : "NT", + } + + states = { + 1 : "Down", + 2 : "UP", + } + + for line in info: + if line[0] == item: + state = 0 + l2state, l2mode = map(saveint, line[1:]) + state_label = "" + if l2state == 1: + state = 2 + state_label = "(!!)" + + mode_label = "" + if l2mode != params['mode']: + state = 2 + mode_label = "(!!)" + + return state, "State: %s%s, Mode: %s%s" % \ + ( states[l2state], state_label, modes[l2mode], mode_label ) + return 3, "Output not found" + +check_info["innovaphone_priports_l2"] = { + "check_function" : check_innovaphone_priports_l2, + "inventory_function" : inventory_innovaphone_priports_l2, + "service_description" : "Port L2 %s", + "has_perfdata" : False, + "snmp_info" : ( ".1.3.6.1.4.1.6666.1.1.1", [ 1, #l2Label + 2, #l2State + 3 #l2Mode + ] ), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.6666", +} +

10 years, 3 months

Check_MK Git: check_mk: services.summary: WERK 566: improved backward compatibility

by Andreas Boesl

Module: check_mk Branch: master Commit: 877c754cd6b88c5e61537aca9d62b81eea1bbbe7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=877c754cd6b88c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 25 11:14:10 2014 +0100 services.summary: WERK 566: improved backward compatibility --- checks/services | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/checks/services b/checks/services index 5fa1f4e..bdf5012 100644 --- a/checks/services +++ b/checks/services @@ -251,7 +251,13 @@ def check_services_summary(item, params, info): num_blacklist = 0 num_auto = 0 for line in info: - startstop, auto = line[2].split("/") + # newer agents also send start type as part of state, + # e.g. running/auto + if '/' in line[2]: + startstop, auto = line[2].split('/') + else: + startstop = line[2] + auto = "unknown" srv_name = line[1] if auto == "auto": num_auto += 1

10 years, 3 months

Check_MK Git: check_mk: improved inline help for wato active check SMB

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: dfffaedd9ce0a2cc8537e5f829e6d7a357d14984 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfffaedd9ce0a2… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Mar 25 09:01:17 2014 +0100 improved inline help for wato active check SMB --- web/plugins/wato/active_checks.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 67e8f04..ca39eca 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1024,6 +1024,8 @@ register_rule(group, ( "share", TextUnicode( title = _("SMB share to check"), + help = _("Enter the plain name of the share only, e. g. <tt>iso</tt>, NOT " + "the full UNC like \\\\servername\\iso"), size = 32, allow_empty = False, )),

10 years, 3 months

Check_MK Git: check_mk: Updated bug entries #1065

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 889bea7bbf755591951694a5b265709f558cea4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=889bea7bbf7555… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Mar 24 13:31:00 2014 +0100 Updated bug entries #1065 --- .bugs/1065 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.bugs/1065 b/.bugs/1065 new file mode 100644 index 0000000..c27611d --- /dev/null +++ b/.bugs/1065 @@ -0,0 +1,27 @@ +Title: objects.precache missing on first start +Component: core +State: open +Date: 2014-03-24 13:28:13 +Targetversion: 1.2.5i1 +Class: bug + +creating a new site with +omd create blubb +[...] +Created new site blubb with version 2014.03.24.mmk. +[...] +su - blubb +OMD[blubb]:~$ omd start +Starting Livestatus Proxy-Daemon...OK +Starting rrdcached...OK +Starting npcd...OK +Starting nagios.............ERROR +Starting dedicated Apache for site blubb...OK +Initializing Crontab...OK + +in nagios.log: +Error: Cannot open config file '/omd/sites/blubb/var/nagios/objects.precache' for reading: No such file or directory + +after a +cmk -R +nagios starts... :-(

10 years, 3 months

Check_MK Git: check_mk: mem.win: now able to configure swap file levels

by Andreas Boesl

Module: check_mk Branch: master Commit: 207481c5d6449981e9ab307835a392bdc498304e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=207481c5d64499… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 21 16:39:40 2014 +0100 mem.win: now able to configure swap file levels --- .werks/735 | 8 ++++++++ ChangeLog | 6 +++--- checkman/mem.win | 4 ++++ checks/mem | 4 +++- web/plugins/wato/check_parameters.py | 33 ++++++++++++++++++++++++++++++--- 5 files changed, 48 insertions(+), 7 deletions(-) diff --git a/.werks/735 b/.werks/735 new file mode 100644 index 0000000..6a0a5f4 --- /dev/null +++ b/.werks/735 @@ -0,0 +1,8 @@ +Title: mem.win: now able to configure swap file levels +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395416329 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d7c3284..f84dfd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,11 +121,11 @@ * 0595 dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption... * 0596 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC * 0597 dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers - * 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature... - NOTE: Please refer to the migration notes! * 0759 check_notify_count: New active check to monitor the number of notifications sent to contacts... * 0760 The windows agent contains meta information about version, manufacturer etc.... ->>>>>>> 309bc055d22c0013242e9c3787049fbd6afb6ff1 + * 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature... + NOTE: Please refer to the migration notes! + * 0735 mem.win: now able to configure swap file levels * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/mem.win b/checkman/mem.win index 296e52c..6aa124a 100644 --- a/checkman/mem.win +++ b/checkman/mem.win @@ -21,6 +21,7 @@ examples: memory_win_default_levels = { "memory" : (80.0, 90.0), # alert at 80%/90% usage "pagefile" : (2048, 1024), # alert, if less then 2/1 GB free + "swap" : (2048, 1024), # alert, if less then 2/1 GB free "average" : 60, # apply levels on 60-min average } @@ -45,6 +46,9 @@ parameters (dict): This check uses a dictionary as parameter. The following {"pagefile"} Warning and critical levels for page file usage. The same rules apply as for {memory}. + {"swap"} Warning and critical levels for swap usage. The same + rules apply as for {memory}. + {"average"} This optional parameters sets a value in minutes for averaging. In that case all warn/crit levels are applied to the averaged values. diff --git a/checks/mem b/checks/mem index 2e26709..a086ea0 100644 --- a/checks/mem +++ b/checks/mem @@ -81,6 +81,7 @@ check_info['mem.used'] = { factory_settings["memory_win_default_levels"] = { "memory" : ( 80.0, 90.0 ), "pagefile" : ( 50.0, 70.0 ), + "swap" : ( 70.0, 80.0 ), } def inventory_mem_win(info): @@ -101,7 +102,8 @@ def check_mem_windows(item, params, info): for title, what, paramname in [ ( "Memory", "Mem", "memory" ), - ( "Page file", "Page", "pagefile" )]: + ( "Page file", "Page", "pagefile" ), + ( "Swap", "Swap", "swap" )]: total_kb = meminfo[what + "Total"] free_kb = meminfo[what + "Free"] used_kb = total_kb - free_kb diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 672927d..36c71f7 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1105,7 +1105,7 @@ register_check_parameters( register_check_parameters( subgroup_os, "memory_pagefile_win", - _("Memory and pagefile levels for Windows"), + _("Memory, pagefile and swap levels for Windows"), Dictionary( elements = [ ( "memory", @@ -1127,7 +1127,7 @@ register_check_parameters( Filesize(title = _("Critical if less than")), ] ), - # Note: Filesize values lesser 1MB will not work + # Note: Memory values lesser 1MB will not work # -> need hide option in filesize valuespec back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024), forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024) @@ -1153,7 +1153,7 @@ register_check_parameters( Filesize(title = _("Critical if less than")), ] ), - # Note: Filesize values lesser 1MB will not work + # Note: Memory values lesser 1MB will not work # -> need hide option in filesize valuespec back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024), forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024) @@ -1161,6 +1161,33 @@ register_check_parameters( ], default_value = (50.0, 70.0)) ), + ( "swap", + Alternative( + title = _("Swap Levels"), + elements = [ + Tuple( + title = _("Swap usage in percent"), + elements = [ + Percentage(title = _("Warning if above")), + Percentage(title = _("Critical if above")), + ] + ), + Transform( + Tuple( + title = _("Absolute free swap"), + elements = [ + Filesize(title = _("Warning if less than")), + Filesize(title = _("Critical if less than")), + ] + ), + # Note: Memory values lesser 1MB will not work + # -> need hide option in filesize valuespec + back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024), + forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024) + ) + ], + default_value = (70.0, 80.0)) + ), ("average", Integer ( title = _("Averaging"),

10 years, 3 months

Check_MK Git: check_mk: enterasys_cpu_util: fixed calculation

by Bastian Kuhn

Module: check_mk Branch: master Commit: b2a81164f1cf6e49795bf725896fbbd2c235b368 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2a81164f1cf6e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 21 15:40:58 2014 +0100 enterasys_cpu_util: fixed calculation --- checks/enterasys_cpu_util | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/enterasys_cpu_util b/checks/enterasys_cpu_util index 30c8a93..0f4fc4f 100644 --- a/checks/enterasys_cpu_util +++ b/checks/enterasys_cpu_util @@ -31,7 +31,7 @@ def inventory_enterasys_cpu_util(info): def check_enterasys_cpu_util(_no_item, params, info): util = 0 for core_util in info: - util += saveint(core_util[0]) / 60 + util += saveint(core_util[0]) / 10 num_cpus = len(info) usage = util / num_cpus return check_cpu_util(usage, params)

10 years, 3 months

Check_MK Git: check_mk: removed unused var

by Bastian Kuhn

Module: check_mk Branch: master Commit: b689fde9a7a0b9f9c405024df566b7be05149d0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b689fde9a7a0b9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 21 15:17:52 2014 +0100 removed unused var --- web/htdocs/wato.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 97cac3e..f27ac12 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13146,7 +13146,6 @@ def rule_matches_host_and_item(rulespec, tag_specs, host_list, item_list, if not hostname_match: reasons.append(_("The host name does not match.")) - tags_match = True for tag in tag_specs: if tag[0] != '/' and tag[0] != '!' and tag not in host[".tags"]: reasons.append(_("The host is missing the tag %s" % tag))

10 years, 3 months

Check_MK Git: check_mk: Wato: Fixed matching of @ all in rule_matches_host_and_item()

by Bastian Kuhn

Module: check_mk Branch: master Commit: 48b95edab6917d288a0de43e70852def2dd68bd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48b95edab6917d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 21 15:05:32 2014 +0100 Wato: Fixed matching of @all in rule_matches_host_and_item() --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 10d10c1..97cac3e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13116,7 +13116,7 @@ def rule_matches_host_and_item(rulespec, tag_specs, host_list, item_list, regex_match = False for check_host in host_list: - if hostname == check_host: + if check_host == "@all" or hostname == check_host: hostname_match = True break else:

10 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2014