Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

5278 FIX check_mk_agent.linux: Fixed wrong detected sensors in state " State disasserted"

by Simon Betz

Module: check_mk Branch: master Commit: f0bbde04e2dda517c7b22e13c8ad5a11b8d4dbbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0bbde04e2dda5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 15 09:52:38 2017 +0200 5278 FIX check_mk_agent.linux: Fixed wrong detected sensors in state "State disasserted" Change-Id: I019ba260b06eb8bf0501ec661c63fcfc3285b543 --- .werks/5278 | 11 +++++++++++ agents/check_mk_agent.linux | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5278 b/.werks/5278 new file mode 100644 index 0000000..6dbab32 --- /dev/null +++ b/.werks/5278 @@ -0,0 +1,11 @@ +Title: check_mk_agent.linux: Fixed wrong detected sensors in state "State disasserted" +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505461781 + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 267138c..37c12de 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -453,7 +453,7 @@ then # At least with ipmi-sensors 0.7.16 this group is Power_Unit instead of "Power Unit" run_cached -s ipmi_sensors 300 "for class in Temperature Power_Unit Fan do - ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache $IPMI_GROUP_OPT \"$class\" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' + ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache $IPMI_GROUP_OPT \"\$class\" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' # In case of a timeout immediately leave loop. if [ $? = 255 ] ; then break ; fi done"

6 years, 9 months

updated werk 5127

by Simon Betz

Module: check_mk Branch: master Commit: dd2bf8d640ce878d03177c1e0117bb0bad7e7bc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd2bf8d640ce87… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 15 07:44:08 2017 +0200 updated werk 5127 Change-Id: Ib425c61d5fd299d44a871ed8f2dab22682da0531 --- notifications/asciimail | 18 ++++++++++++------ notifications/mail | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/notifications/asciimail b/notifications/asciimail index 94f17d8..cd2f6e1 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -215,19 +215,25 @@ def read_bulk_contexts(): return parameters, contexts -def get_bulk_notification_subject(parameters, contexts, hosts): +def get_bulk_notification_subject(contexts, hosts): hosts = list(hosts) - if parameters.get("PARAMETER_BULK_SUBJECT"): - subject = parameters["PARAMETER_BULK_SUBJECT"] + bulk_subject = None + for context in contexts: + if context.get("PARAMETER_BULK_SUBJECT"): + bulk_subject = context["PARAMETER_BULK_SUBJECT"] + break + + if bulk_subject: + subject = bulk_subject elif len(hosts) == 1: subject = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for %s" % hosts[0] else: subject = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for $COUNT_HOSTS$ hosts" if "$COUNT_NOTIFICATIONS$" in subject: - subject.replace("$COUNT_NOTIFICATIONS$", len(contexts)) + subject = subject.replace("$COUNT_NOTIFICATIONS$", str(len(contexts))) if "$COUNT_HOSTS$" in subject: - subject.replace("$COUNT_HOSTS$", len(hosts)) + subject = subject.replace("$COUNT_HOSTS$", str(len(hosts))) return subject @@ -242,7 +248,7 @@ def main(): mailto = context['CONTACTEMAIL'] # Assume the same in each context subject = context['SUBJECT'] hosts.add(context["HOSTNAME"]) - subject = get_bulk_notification_subject(parameters, contexts, hosts) + subject = get_bulk_notification_subject(contexts, hosts) else: # gather all options from env diff --git a/notifications/mail b/notifications/mail index 8cbdadd..464704d 100755 --- a/notifications/mail +++ b/notifications/mail @@ -949,19 +949,25 @@ def read_bulk_contexts(): return parameters, contexts -def get_bulk_notification_subject(parameters, contexts, hosts): +def get_bulk_notification_subject(contexts, hosts): hosts = list(hosts) - if parameters.get("PARAMETER_BULK_SUBJECT"): - subject = parameters["PARAMETER_BULK_SUBJECT"] + bulk_subject = None + for context in contexts: + if context.get("PARAMETER_BULK_SUBJECT"): + bulk_subject = context["PARAMETER_BULK_SUBJECT"] + break + + if bulk_subject: + subject = bulk_subject elif len(hosts) == 1: subject = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for %s" % hosts[0] else: subject = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for $COUNT_HOSTS$ hosts" if "$COUNT_NOTIFICATIONS$" in subject: - subject.replace("$COUNT_NOTIFICATIONS$", len(contexts)) + subject = subject.replace("$COUNT_NOTIFICATIONS$", str(len(contexts))) if "$COUNT_HOSTS$" in subject: - subject.replace("$COUNT_HOSTS$", len(hosts)) + subject = subject.replace("$COUNT_HOSTS$", str(len(hosts))) return subject @@ -981,7 +987,7 @@ def main(): mailto = context['CONTACTEMAIL'] # Assume the same in each context subject = context['SUBJECT'] hosts.add(context["HOSTNAME"]) - subject = get_bulk_notification_subject(parameters, contexts, hosts) + subject = get_bulk_notification_subject(contexts, hosts) else: # gather all options from env

6 years, 9 months

5127 asciimail, mail: Added macros $COUNT_NOTIFICATIONS$ and $COUNT_HOSTS$ which can be used in bulk notification subject

by Simon Betz

Module: check_mk Branch: master Commit: 90f05a3a9492a1b00fa7926f75ed0961b16ac85e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90f05a3a9492a1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 13 16:27:51 2017 +0200 5127 asciimail, mail: Added macros $COUNT_NOTIFICATIONS$ and $COUNT_HOSTS$ which can be used in bulk notification subject In notification bulking you're able to customize your own subject. Moreover if the macro {{$COUNT_NOTIFICATIONS$}} is used, the amount of notifications will be inserted and if you use the macro {{$COUNT_HOSTS$}} then the amount of hosts will be applied. Change-Id: Ic80c5c8ff6eac114463522b44962faa78b78e27e --- .werks/5127 | 13 +++++++++++++ notifications/asciimail | 19 +++++++++++-------- notifications/mail | 20 ++++++++++++-------- web/htdocs/wato.py | 9 +++++++-- 4 files changed, 43 insertions(+), 18 deletions(-) diff --git a/.werks/5127 b/.werks/5127 new file mode 100644 index 0000000..d763f11 --- /dev/null +++ b/.werks/5127 @@ -0,0 +1,13 @@ +Title: asciimail, mail: Added macros $COUNT_NOTIFICATIONS$ and $COUNT_HOSTS$ which can be used in bulk notification subject +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505312621 +Class: feature + +In notification bulking you're able to customize your own subject. +Moreover if the macro {{$COUNT_NOTIFICATIONS$}} is used, the amount of +notifications will be inserted and if you use the macro {{$COUNT_HOSTS$}} +then the amount of hosts will be applied. diff --git a/notifications/asciimail b/notifications/asciimail index 3e72eef..94f17d8 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -216,16 +216,19 @@ def read_bulk_contexts(): def get_bulk_notification_subject(parameters, contexts, hosts): + hosts = list(hosts) if parameters.get("PARAMETER_BULK_SUBJECT"): - return parameters["PARAMETER_BULK_SUBJECT"] - + subject = parameters["PARAMETER_BULK_SUBJECT"] + elif len(hosts) == 1: + subject = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for %s" % hosts[0] else: - hosts = list(hosts) - if len(hosts) == 1: - return "Check_MK: %d notifications for %s" % (len(contexts), hosts[0]) - else: - return "Check_MK: %d notifications for %d hosts" % \ - (len(contexts), len(hosts)) + subject = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for $COUNT_HOSTS$ hosts" + + if "$COUNT_NOTIFICATIONS$" in subject: + subject.replace("$COUNT_NOTIFICATIONS$", len(contexts)) + if "$COUNT_HOSTS$" in subject: + subject.replace("$COUNT_HOSTS$", len(hosts)) + return subject def main(): diff --git a/notifications/mail b/notifications/mail index 4c8920f..8cbdadd 100755 --- a/notifications/mail +++ b/notifications/mail @@ -950,16 +950,20 @@ def read_bulk_contexts(): def get_bulk_notification_subject(parameters, contexts, hosts): + hosts = list(hosts) if parameters.get("PARAMETER_BULK_SUBJECT"): - return parameters["PARAMETER_BULK_SUBJECT"] - + subject = parameters["PARAMETER_BULK_SUBJECT"] + elif len(hosts) == 1: + subject = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for %s" % hosts[0] else: - hosts = list(hosts) - if len(hosts) == 1: - return "Check_MK: %d notifications for %s" % (len(contexts), hosts[0]) - else: - return "Check_MK: %d notifications for %d hosts" % \ - (len(contexts), len(hosts)) + subject = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for $COUNT_HOSTS$ hosts" + + if "$COUNT_NOTIFICATIONS$" in subject: + subject.replace("$COUNT_NOTIFICATIONS$", len(contexts)) + if "$COUNT_HOSTS$" in subject: + subject.replace("$COUNT_HOSTS$", len(hosts)) + return subject + def main(): if bulk_mode: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 243c617..a05d0b8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7671,9 +7671,14 @@ def vs_notification_rule(userid = None): ( "bulk_subject", TextAscii( title = _("Subject for bulk notifications"), help = _("Customize the subject for bulk notifications and overwrite " - "default subject 'Check_MK: X notifications for HOST' resp. " - "'Check_MK: X notifications for Y hosts'."), + "default subject <tt>Check_MK: $COUNT_NOTIFICATIONS$ notifications for HOST</tt>" + " resp. <tt>Check_MK: $COUNT_NOTIFICATIONS$ notifications for $COUNT_HOSTS$ hosts</tt>. " + "Both macros <tt>$COUNT_NOTIFICATIONS$</tt> and <tt>$COUNT_HOSTS$</tt> can be used in " + "any customized subject. If <tt>$COUNT_NOTIFICATIONS$</tt> is used, the amount of " + "notifications will be inserted and if you use <tt>$COUNT_HOSTS$</tt> then the " + "amount of hosts will be applied."), size = 80, + default_value = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for $COUNT_HOSTS$ hosts" )), ], columns = 1,

6 years, 9 months

4807 safenet_hsm, safenet_hsm.events, safenet_ntls, safenet_ntls.clients, safenet_ntls.connrate, safenet_ntls.expiration, safenet_ntls.links: Several new checks to monitor Safenet HSM appliances

by Konstantin Büttner

Module: check_mk Branch: master Commit: 99fc319e0f02db0cb72de061d146fe4a0675d8f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99fc319e0f02db… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Sep 11 16:28:48 2017 +0200 4807 safenet_hsm, safenet_hsm.events, safenet_ntls, safenet_ntls.clients, safenet_ntls.connrate, safenet_ntls.expiration, safenet_ntls.links: Several new checks to monitor Safenet HSM appliances Change-Id: I581d53e48c6328d58bcf2a422ede14bfe8cd74a5 --- .werks/4807 | 10 ++ checkman/safenet_hsm | 12 ++ checkman/safenet_hsm.events | 12 ++ checkman/safenet_ntls | 11 ++ checkman/safenet_ntls.clients | 10 ++ checkman/safenet_ntls.connrate | 12 ++ checkman/safenet_ntls.expiration | 10 ++ checkman/safenet_ntls.links | 10 ++ checks/safenet_hsm | 216 ++++++++++++++++++++++++++++++++++ checks/safenet_ntls | 220 +++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 91 +++++++++++++++ 11 files changed, 614 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=99fc319e0f…

6 years, 9 months

5219 brocade_sfp, brocade_sfp.temp: New checks to monitor SFPs of Brocade fibre channel switches

by Konstantin Büttner

Module: check_mk Branch: master Commit: b35f7a5bdc050b9fa1d0fb924aa64b78dd65b54c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b35f7a5bdc050b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Aug 14 18:15:42 2017 +0200 5219 brocade_sfp, brocade_sfp.temp: New checks to monitor SFPs of Brocade fibre channel switches These checks allow to monitor the power level, temperature, current and voltage of the SFPs. Change-Id: I983e01688434f5341fe20a07ab1b9d3f8bdf43fd --- .werks/5219 | 10 ++ checkman/brocade_sfp | 22 +++++ checkman/brocade_sfp.temp | 22 +++++ checks/brocade_sfp | 184 +++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 26 +++++ 5 files changed, 264 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b35f7a5bdc…

6 years, 9 months

Refactoring: Extract logic for item calculation and inventory rules from brocade_fcport to brocade.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 072d328c273b40910ed9bb449ea4e63bc23ab6f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=072d328c273b40… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Aug 14 15:29:22 2017 +0200 Refactoring: Extract logic for item calculation and inventory rules from brocade_fcport to brocade.include This is in preparation for a new check that needs to share this logic. Change-Id: Ieef47a0d74855bc3a0876897b4b14d4edad21bf9 --- checks/brocade.include | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ checks/brocade_fcport | 42 ++++++++++------------------------ 2 files changed, 74 insertions(+), 30 deletions(-) diff --git a/checks/brocade.include b/checks/brocade.include new file mode 100644 index 0000000..66991cd --- /dev/null +++ b/checks/brocade.include @@ -0,0 +1,62 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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- +# tails. 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. + +# This is the variable for the actual rule +brocade_fcport_inventory = [] + +def brocade_fcport_inventory_this_port(admstate, phystate, opstate, settings): + default_inventory_phystates = [ 3, 4, 5, 6, 7, 8, 9, 10 ] + default_inventory_opstates = [ 1, 2, 3, 4, ] + default_inventory_admstates = [ 1, 3, 4, ] + + admstates = settings.get('admstates', default_inventory_admstates) + opstates = settings.get('opstates', default_inventory_opstates) + phystates = settings.get('phystates', default_inventory_phystates) + + return admstate in admstates and \ + opstate in opstates and \ + phystate in phystates + + + +def brocade_fcport_getitem(number_of_ports, index, portname, is_isl, settings): + + uses_portname = settings.get('use_portname', True) + shows_isl = settings.get('show_isl', True) + + itemname = ("%0" + str(len(str(number_of_ports))) + "d") % (index - 1) + if is_isl and shows_isl: + itemname += " ISL" + if portname.strip() and uses_portname: + itemname += " " + portname.strip() + return itemname + + +# Inverse to the above. Caveat: Maps back to an index that starts with 1, +# as the SNMP tables in brocade_fcport and brocade_sfp are indexed this way. +# TODO: Check whether we can simplify brocade_fcport a bit using this. +def brocade_item_to_port_number(item): + return int(item.split()[0]) + 1 diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 0b115ed..073b36f 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -88,15 +88,6 @@ isl_speed = { "512": 16, # sexdecuple (512) - 16 Gbaud } -# settings for inventory: which ports should be inventorized -brocade_fcport_inventory_phystates = [ 3, 4, 5, 6, 7, 8, 9, 10 ] -brocade_fcport_inventory_opstates = [ 1, 2, 3, 4, ] -brocade_fcport_inventory_admstates = [ 1, 3, 4, ] -brocade_fcport_inventory_use_portname = True # use swFCPortName as part of service description -brocade_fcport_inventory_show_isl = True # add "ISL" to service description for interswitch links -brocade_fcport_inventory = [] - - factory_settings["brocade_fcport_default_levels"] = { "rxcrcs": (3.0, 20.0), # allowed percentage of CRC errors "rxencoutframes": (3.0, 20.0), # allowed percentage of Enc-OUT Frames @@ -107,16 +98,6 @@ factory_settings["brocade_fcport_default_levels"] = { } -# Helper function for computing item from port number -def brocade_fcport_getitem(ports, index, portname, is_isl, uses_portname, shows_isl): - itemname = ("%0" + str(len(str(len(ports)))) + "d") % (index - 1) - if is_isl and shows_isl: - itemname += " ISL" - if portname.strip() and uses_portname: - itemname += " " + portname.strip() - return itemname - - def parse_brocade_fcport(info): if_info, link_info, speed_info, if64_info = info isl_ports = {} @@ -202,22 +183,22 @@ def parse_brocade_fcport(info): def inventory_brocade_fcport(parsed): settings = host_extra_conf_merged(host_name(), brocade_fcport_inventory) - uses_portname = settings.get('use_portname', brocade_fcport_inventory_use_portname) - shows_isl = settings.get('show_isl', brocade_fcport_inventory_show_isl) - admstates = settings.get('admstates', brocade_fcport_inventory_admstates) - opstates = settings.get('opstates', brocade_fcport_inventory_opstates) - phystates = settings.get('phystates', brocade_fcport_inventory_phystates) inventory = [] for if_entry in parsed: + admstate = if_entry["admstate"] phystate = if_entry["phystate"] opstate = if_entry["opstate"] - admstate = if_entry["admstate"] - if admstate in admstates and \ - opstate in opstates and \ - phystate in phystates: - inventory.append((brocade_fcport_getitem(parsed, if_entry["index"], if_entry["portname"], - if_entry["is_isl"], uses_portname, shows_isl), + if brocade_fcport_inventory_this_port(admstate=admstate, + phystate=phystate, + opstate=opstate, + settings=settings): + inventory.append((brocade_fcport_getitem( + number_of_ports=len(parsed), + index=if_entry["index"], + portname=if_entry["portname"], + is_isl=if_entry["is_isl"], + settings=settings), '{ "phystate": [%d], "opstate": [%d], "admstate": [%d] }' % \ (phystate, opstate, admstate))) return inventory @@ -444,6 +425,7 @@ check_info["brocade_fcport"] = { ], 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") \ and oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.*") != None, + 'includes' : [ 'brocade.include' ], 'group' : 'brocade_fcport', 'default_levels_variable' : 'brocade_fcport_default_levels', }

6 years, 9 months

added bug regarding the breakup of a connection between master and slave site

by Marcel Arentz

Module: check_mk Branch: master Commit: a6ff7e43b63e63e20ccf174312c3b80abcc2768e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6ff7e43b63e63… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Sep 14 15:16:14 2017 +0200 added bug regarding the breakup of a connection between master and slave site Change-Id: I28d78bb98273a59d5cd64b4639111bcf8046cb0c --- .bugs/2516 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2516 b/.bugs/2516 new file mode 100644 index 0000000..fc14396 --- /dev/null +++ b/.bugs/2516 @@ -0,0 +1,12 @@ +Title: Sites crashes if connection is changed from slave to no replication +Component: wato +State: open +Date: 2017-09-14 15:09:37 +Targetversion: 1.4.0 +Class: nastiness + +At the moment there is no warning, if a site connection is changed from +"Slave" to "No replication". Configured hosts on the master site still +persists even if the slave site is not available anymore. You will need to +manually change the attribute "Monitored on site" on all hosts which did +belong to the slave site. Otherwise you are not able to remove them.

6 years, 9 months

5220 brocade_sys, brocade_sys.mem: New checks to monitor main memory usage and CPU utilization of Brocade fibre channel switches

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7f3406c1c9d01fb44d629db560b026400621b8ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f3406c1c9d01f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Sep 13 14:03:12 2017 +0200 5220 brocade_sys, brocade_sys.mem: New checks to monitor main memory usage and CPU utilization of Brocade fibre channel switches Change-Id: Idf1bf5a669cfa3c8783f98f9041c71c6bb4f431c --- .werks/5220 | 10 ++++ checkman/brocade_sys | 13 +++++ checkman/brocade_sys.mem | 13 +++++ checks/brocade_sys | 109 +++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 22 +++++++ 5 files changed, 167 insertions(+) diff --git a/.werks/5220 b/.werks/5220 new file mode 100644 index 0000000..c4a95ad --- /dev/null +++ b/.werks/5220 @@ -0,0 +1,10 @@ +Title: brocade_sys, brocade_sys.mem: New checks to monitor main memory usage and CPU utilization of Brocade fibre channel switches +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505304149 +Class: feature + + diff --git a/checkman/brocade_sys b/checkman/brocade_sys new file mode 100644 index 0000000..229a5e7 --- /dev/null +++ b/checkman/brocade_sys @@ -0,0 +1,13 @@ +title: Brocade FibreChannel Switches: CPU +catalog: hw/storagehw/brocade +agents: snmp +license: GPL +distribution: check_mk +description: + This checks monitors the CPU utilization. + +item: + None + +inventory: + One check per device is created diff --git a/checkman/brocade_sys.mem b/checkman/brocade_sys.mem new file mode 100644 index 0000000..5d36d78 --- /dev/null +++ b/checkman/brocade_sys.mem @@ -0,0 +1,13 @@ +title: Brocade FibreChannel Switches: Memory +catalog: hw/storagehw/brocade +agents: snmp +license: GPL +distribution: check_mk +description: + This checks monitors the main memory usage in percent. Absolute values are not available. + +item: + None + +inventory: + One check per device is created diff --git a/checks/brocade_sys b/checks/brocade_sys new file mode 100644 index 0000000..b7a2262 --- /dev/null +++ b/checks/brocade_sys @@ -0,0 +1,109 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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- +# tails. 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 parse_brocade_sys(info): + return { + "cpu_util" : int(info[0][0]), + "mem_used_percent" : int(info[0][1]), + } + + +# .--Memory--------------------------------------------------------------. +# | __ __ | +# | | \/ | ___ _ __ ___ ___ _ __ _ _ | +# | | |\/| |/ _ \ '_ ` _ \ / _ \| '__| | | | | +# | | | | | __/ | | | | | (_) | | | |_| | | +# | |_| |_|\___|_| |_| |_|\___/|_| \__, | | +# | |___/ | +# '----------------------------------------------------------------------' + +def inventory_brocade_sys_mem(parsed): + return [ (None, None) ] + + +def check_brocade_sys_mem(item, params, parsed): + mem_used_percent = parsed["mem_used_percent"] + infotext = "%s%%" % mem_used_percent + if params is None: + perfdata = [ ("mem_used_percent", mem_used_percent) ] + return 0, infotext, perfdata + else: + warn, crit = params + perfdata = [ ("mem_used_percent", mem_used_percent, warn, crit) ] + levelstext = " (warn/crit at %d/%d%%)" % (warn, crit) + if mem_used_percent >= crit: + status = 2 + elif mem_used_percent >= warn: + status = 1 + else: + status = 0 + if status: + infotext += levelstext + return status, infotext, perfdata + + +check_info['brocade_sys.mem'] = { + 'inventory_function' : inventory_brocade_sys_mem, + 'check_function' : check_brocade_sys_mem, + 'service_description' : 'Memory used', + 'group' : 'memory_relative', + 'has_perfdata' : True, +} + +#. +# .--CPU-----------------------------------------------------------------. +# | ____ ____ _ _ | +# | / ___| _ \| | | | | +# | | | | |_) | | | | | +# | | |___| __/| |_| | | +# | \____|_| \___/ | +# | | +# '----------------------------------------------------------------------' + + +def inventory_brocade_sys(parsed): + return [ (None, None) ] + + +def check_brocade_sys(item, params, parsed): + return check_cpu_util(parsed["cpu_util"], params) + + +check_info['brocade_sys'] = { + 'parse_function' : parse_brocade_sys, + 'inventory_function' : inventory_brocade_sys, + 'check_function' : check_brocade_sys, + 'service_description' : 'CPU utilization', + 'snmp_info' : ('.1.3.6.1.4.1.1588.2.1.1.1.26', [ # Brocade-REG-MIB + "1", # swCpuUsage + "6", # swMemoryUsage + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1"), + 'group' : 'cpu_utilization', + 'includes' : [ 'cpu_util.include' ], + 'has_perfdata' : True, +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 666eb13..a032788 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7807,6 +7807,28 @@ register_check_parameters( register_check_parameters( subgroup_os, + "memory_relative", + _("Main memory usage for Brocade fibre channel switches"), + OptionalDropdownChoice( + title = _("Memory usage"), + choices = [ + ( None, _("Do not impose levels")) + ], + otherlabel = _("Percentual levels ->"), + explicit = \ + Tuple( + elements = [ + Integer(title=_("Warning at"), default_value=85, unit="%"), + Integer(title=_("Critical at"), default_value=90, unit="%"), + ] + ) + ), + None, + "first" +) + +register_check_parameters( + subgroup_os, "memory_simple", _("Main memory usage of simple devices"), Transform(

6 years, 9 months

made help text for check interval for host checks more specific

by Marcel Arentz

Module: check_mk Branch: master Commit: 0f775e6a9ead33068cab3ca5a93908aa95cd5f98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f775e6a9ead33… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Sep 14 13:44:38 2017 +0200 made help text for check interval for host checks more specific Change-Id: I30b08fdde6454b3e7cea3a0cdee93e0d4cc9445b --- web/plugins/wato/check_mk_configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 60f2a0c..fbdd4e0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1620,7 +1620,7 @@ register_rule(group, forth = lambda v: int(v * 60), back = lambda v: float(v) / 60.0, title = _("Normal check interval for host checks"), - help = _("The default interval is set to one minute. Here you can specify a larger " + help = _("The default interval is set to 6 seconds for smart ping and one minute for all other. Here you can specify a larger " "interval. The host is contacted in this interval on a regular base. The host " "check is also being executed when a problematic service state is detected to check " "wether or not the service problem is resulting from a host problem.") @@ -1638,7 +1638,7 @@ register_rule(group, "attempts to a number greater than one. In case a host check is not UP " "and the maximum number of check attempts is not yet reached, it will be " "rescheduled with this interval. The retry interval is usually set to a smaller " - "value than the normal interval."), + "value than the normal interval. The default is 6 seconds for smart ping and 60 seconds for all other."), ) )

6 years, 9 months

More .f12 fixes/tweaks.

by Sven Panne

Module: check_mk Branch: master Commit: a41c5c4e4f99e4c457b9960e2c47e1b8bad53421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a41c5c4e4f99e4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Sep 14 10:27:26 2017 +0200 More .f12 fixes/tweaks. Change-Id: Icace4733d2852d135956395ccd1ee983a3dfa624 --- omd/packages/net-snmp/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/net-snmp/.f12 b/omd/packages/net-snmp/.f12 index e7fd4d2..3762c7a 100755 --- a/omd/packages/net-snmp/.f12 +++ b/omd/packages/net-snmp/.f12 @@ -3,7 +3,7 @@ set -e SITE=${SITE:-$(cat ../../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} -ROOT=$ROOT +ROOT=/omd/sites/$SITE echo "Installing to site \"$SITE\"..."

6 years, 9 months

← Newer
1
...
12
13
14
15
16
17
18
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017