Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64592 discussions

Check_MK Git: check_mk: New checks fjdarye101_disks fjdarye101_rluns: Fujitsu Storage Systems with 2013 Firmware

by Bastian Kuhn

Module: check_mk Branch: master Commit: a5511409e958c8dc202a928aa4c8a3a75755b4b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5511409e958c8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 3 15:29:59 2014 +0100 New checks fjdarye101_disks fjdarye101_rluns: Fujitsu Storage Systems with 2013 Firmware --- .werks/132 | 8 +++++++ ChangeLog | 3 ++- checkman/fjdarye101_disks | 26 ++++++++++++++++++++ checkman/fjdarye101_disks.summary | 34 +++++++++++++++++++++++++++ checkman/fjdarye101_rluns | 27 +++++++++++++++++++++ checks/fjdarye100_rluns | 14 +++++------ checks/fjdarye101_disks | 47 +++++++++++++++++++++++++++++++++++++ checks/fjdarye101_rluns | 35 +++++++++++++++++++++++++++ checks/fjdarye60_rluns | 35 +++++---------------------- 9 files changed, 191 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a5511409e9…

10 years, 8 months

Check_MK Git: check_mk: Merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2bdaf99dd6edd53c62133056fdf9ac2097581bad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bdaf99dd6edd5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 3 15:30:44 2014 +0100 Merge conflict ---

10 years, 8 months

Check_MK Git: check_mk: emcvnx_info: now reports information about Model an Revision correctly. It retrieves this information by an additional call of naviseccli with getagent option

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 97f3ea3acca6c09831fe6e1e64a2e3351621449d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97f3ea3acca6c0… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Feb 3 14:59:25 2014 +0100 emcvnx_info: now reports information about Model an Revision correctly. It retrieves this information by an additional call of naviseccli with getagent option --- agents/special/agent_emcvnx | 29 +++++++++++++++++++++++------ checkman/emcvnx_info | 8 ++++++++ web/plugins/wato/datasource_programs.py | 1 + 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_emcvnx b/agents/special/agent_emcvnx index 887ba29..35e5e89 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -65,9 +65,9 @@ OPTIONS: -i MODULES, --modules MODULES Modules to query. This is a comma separated list of which may contain the keywords "disks", "hba", "hwstatus", - "raidgroups" or "all" to define which information should - be queried from the SP. You can define to use only view of - them to optimize performance. The default is "all". + "raidgroups", "agent" or "all" to define which information + should be queried from the SP. You can define to use only + view of them to optimize performance. The default is "all". """) @@ -93,6 +93,7 @@ host_address = None user = None password = None mortypes = [ 'all' ] +fetch_agent_info = False naviseccli_options = { "disks" : {"cmd_option" : "-disk", "active" : False}, @@ -135,6 +136,7 @@ for module in naviseccli_options.keys(): try: if mortypes.index("all") >= 0: naviseccli_options[module]["active"] = True + fetch_agent_info = True except ValueError: pass @@ -144,19 +146,24 @@ for module in naviseccli_options.keys(): except ValueError: pass +try: + if mortypes.index("agent") >= 0: + fetch_agent_info = True +except ValueError: + pass ############################################################################# # fetch information by calling naviseccli ############################################################################# -basecmd="naviseccli -h %s -User %s -Password '%s' -Scope 0 getall " % (host_address, user, password) +basecmd="naviseccli -h %s -User %s -Password '%s' -Scope 0 " % (host_address, user, password) # # check_mk section of agent output # print "<<<check_mk>>>" -cmd=basecmd + "-sp" +cmd=basecmd + "getall -sp" if opt_debug: sys.stderr.write("executing external command: %s\n" % cmd) @@ -179,13 +186,23 @@ print "<<<emcvnx_info>>>" for line in cmdout: print line +# if module "agent" was requested, fetch additional information about the +# agent, e. g. Model and Revision +if fetch_agent_info: + cmd=basecmd + "getagent" + if opt_debug: + sys.stderr.write("executing external command: %s\n" % cmd) + + for line in os.popen(cmd).readlines(): + print line, + # # all other sections of agent output # for module in naviseccli_options.keys(): if naviseccli_options[module]["active"] == True: print "<<<emcvnx_%s>>>" % module - cmd=basecmd + naviseccli_options[module]["cmd_option"] + cmd=basecmd + "getall " + naviseccli_options[module]["cmd_option"] if opt_debug: sys.stderr.write("executing external command: %s\n" % cmd) for line in os.popen(cmd).readlines(): diff --git a/checkman/emcvnx_info b/checkman/emcvnx_info index d37855e..a85329c 100644 --- a/checkman/emcvnx_info +++ b/checkman/emcvnx_info @@ -12,5 +12,13 @@ description: The information is retriefed by the special agent agent_emcvnx which uses EMC's command line tool naviseccli. + The full information is only available if you did switch on the "Model and + Revsion" switch in the WATO rule "Check state of EMC VNX storage systems" or + did call the special agent (as datasource program) with --modules option + including "agent" module. If you are not interested in Model and Revision of + your Storage device you can switch this off and save one call of naviseccli in + every check interval. In this case the Check reports only the serial number + of the SP. + inventory: Finds exactly one check on every EMC VNX storage system called EMC VNX Info diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 60f39f5..9989cbc 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -193,6 +193,7 @@ register_rule(group, ( "hba", _("iSCSI HBAs") ), ( "hwstatus", _("Hardware Status") ), ( "raidgroups", _("RAID Groups") ), + ( "agent", _("Model and Revsion") ), ], default_value = [ "disks", "hba", "hwstatus", ], allow_empty = False,

10 years, 8 months

Check_MK Git: check_mk: FIX Fixed exception when view title or description was missing

by Andreas Boesl

Module: check_mk Branch: master Commit: e2f0ff96056565140e5fa952d95d534c5ee38935 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2f0ff96056565… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 3 14:30:05 2014 +0100 FIX Fixed exception when view title or description was missing --- .werks/274 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/.werks/274 b/.werks/274 new file mode 100644 index 0000000..8bfe4fe --- /dev/null +++ b/.werks/274 @@ -0,0 +1,9 @@ +Title: Fixed exception when view title or description was missing +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1391434136 + + diff --git a/ChangeLog b/ChangeLog index 5e0ecc0..977a936 100644 --- a/ChangeLog +++ b/ChangeLog @@ -192,6 +192,7 @@ * 0676 FIX: Move view "Stale services" to Problems folder * 0270 FIX: Multisite host tag filter: Now uses exact match... * 0273 FIX: Fixed exceptions when modifying / cloning views... + * 0274 FIX: Fixed exception when view title or description was missing WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8085e88..f47dbfc 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -278,6 +278,11 @@ def load_views(): html.multisite_views[(user, name)] = view + # Repair views with missing 'title' or 'description' + for key in [ "title", "description" ]: + if key not in view: + view[key] = _("Missing %s") % key + except SyntaxError, e: raise MKGeneralException(_("Cannot load views from %s/views.mk: %s") % (dirpath, e))

10 years, 8 months

Check_MK Git: check_mk: emcvnx_raidgroups: did fail on very first check with an index out of range exception

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 91fb977c212575e3e65b9a8108b1a1ad83855528 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91fb977c212575… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Feb 3 13:51:01 2014 +0100 emcvnx_raidgroups: did fail on very first check with an index out of range exception --- checks/emcvnx_raidgroups | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/emcvnx_raidgroups b/checks/emcvnx_raidgroups index dffb854..6b559a9 100644 --- a/checks/emcvnx_raidgroups +++ b/checks/emcvnx_raidgroups @@ -201,7 +201,9 @@ def check_emcvnx_raidgroups_capacity(item, params, info): # variable name in perfdata is not allowed to be just a number # especially 0 does not work, so prefix it generally with "rg" rc, message, perfdata = df_check_filesystem_list(item, params, fslist) - perfdata[0] = ("rg" + perfdata[0][0], perfdata[0][1], perfdata[0][2], perfdata[0][3], perfdata[0][4], perfdata[0][5]) + # note: on very first run perfdata is empty + if len(perfdata) > 0: + perfdata[0] = ("rg" + perfdata[0][0], perfdata[0][1], perfdata[0][2], perfdata[0][3], perfdata[0][4], perfdata[0][5]) return rc, message, perfdata

10 years, 8 months

Check_MK Git: check_mk: emc_isilon_iops: New check for Disk Operations per Second (IOPS) in EMC Isilon Storage

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: c915874b4f763e9086f52b7663918b33c3a4eb50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c915874b4f763e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Feb 3 12:26:56 2014 +0100 emc_isilon_iops: New check for Disk Operations per Second (IOPS) in EMC Isilon Storage --- .werks/699 | 8 +++++ ChangeLog | 3 +- checkman/emc_isilon_iops | 20 +++++++++++ checks/emc_isilon_iops | 52 ++++++++++++++++++++++++++++ pnp-templates/check_mk-emc_isilon_iops.php | 48 +++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 6 ++++ 6 files changed, 136 insertions(+), 1 deletion(-) diff --git a/.werks/699 b/.werks/699 new file mode 100644 index 0000000..c114b5a --- /dev/null +++ b/.werks/699 @@ -0,0 +1,8 @@ +Title: emc_isilon_iops: New check for Disk Operations per Second (IOPS) in EMC Isilon Storage +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1391426800 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 82d997e..5e0ecc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 0576 fileinfo.groups: new feature to include current date in file pattern * 0130 Support of new Firmware version of various Fujitsu Sotarge Systems * 0698 emc_isilon.nodehealth: new check for EMC Isilon Storage systems: NodeHealth + * 0699 emc_isilon_iops: New check for Disk Operations per Second (IOPS) in EMC Isilon Storage * 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... @@ -149,8 +150,8 @@ * 0262 FIX: ps: Now able to skip disabled "Process Inventory" rules... * 0264 FIX: printer_supply_ricoh: now reports correct filling levels... * 0575 FIX: cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: improved handling of warning state... - * 0577 FIX: fileinfo.groups: new date pattern is now available for inventory check as well * 0272 FIX: if checks: port type 56 (fibrechannel) is no longer inventorized per default... + * 0577 FIX: fileinfo.groups: new date pattern is now available for inventory check as well Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checkman/emc_isilon_iops b/checkman/emc_isilon_iops new file mode 100644 index 0000000..894bdc6 --- /dev/null +++ b/checkman/emc_isilon_iops @@ -0,0 +1,20 @@ +title: EMC Isilon: Disk Operations per Second (IOPS) +agents: snmp +catalog: hw/storagehw/emc +license: GPL +distribution: check_mk +description: + Reports the Disk Operations per Second (IOPS) of Disks in EMC Isilon + Storage Systems. + + This check always returns {OK} + +item: + The diskPerfDeviceName as reported by SNMP, e. g. "bay 4" + +perfdata: + One value: The number of IOPS. + +inventory: + Finds exactly one service per disk in an EMC Isilon Storage. + diff --git a/checks/emc_isilon_iops b/checks/emc_isilon_iops new file mode 100644 index 0000000..e6d7906 --- /dev/null +++ b/checks/emc_isilon_iops @@ -0,0 +1,52 @@ +#!/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_emc_isilon_iops(info): + inventory = [] + for name, iops in info: + inventory.append( (name, None) ) + return inventory + +def check_emc_isilon_iops(item, _no_params, info): + for name, iops in info: + if name == item: + perfdata = [ ("iops", iops) ] + message = "%s disk operations per second" % int(iops) + return 0, message, perfdata + return 3, "Disk not found" + +check_info["emc_isilon_iops"] = { + "check_function" : check_emc_isilon_iops, + "inventory_function" : inventory_emc_isilon_iops, + "service_description" : "Disk %s IO", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.12124.2.2.52.1", + [ 2, # diskPerfDeviceName + 3, # diskPerfOpsPerSecond + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") +} + diff --git a/pnp-templates/check_mk-emc_isilon_iops.php b/pnp-templates/check_mk-emc_isilon_iops.php new file mode 100644 index 0000000..0b838e6 --- /dev/null +++ b/pnp-templates/check_mk-emc_isilon_iops.php @@ -0,0 +1,48 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +// Make data sources available via names +$RRD = array(); +foreach ($NAME as $i => $n) { + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; +} + +$servicedesc = str_replace("_", " ", $servicedesc); + +$opt[1] = "--vertical-label 'operations/s' -X0 --title \"$hostname / $servicedesc\" "; + +$def[1] = + "HRULE:0#a0a0a0 ". + "DEF:read_blocks=$RRD[iops] ". + "AREA:read_blocks#40c080:\"operations per second \" ". + "GPRINT:read_blocks:LAST:\"%8.0lf last\" ". + "GPRINT:read_blocks:AVERAGE:\"%6.0lf avg\" ". + "GPRINT:read_blocks:MAX:\"%6.0lf max\\n\" "; +?> + diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 55cc931..320fcb2 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -528,6 +528,12 @@ def perfometer_check_mk_hba(row, check_command, perf_data): read_blocks, "#30d050", write_blocks, "#0060c0", 100000, 2) perfometers["check_mk-emcvnx_hba"] = perfometer_check_mk_hba +def perfometer_check_mk_iops(row, check_command, perf_data): + iops = int(perf_data[0][1]) + text = "%d/s" % iops + + return text, perfometer_logarithmic(iops, 100000, 2, "#30d050") +perfometers["check_mk-emc_isilon_iops"] = perfometer_check_mk_iops def perfometer_check_mk_printer_supply(row, check_command, perf_data): left = savefloat(perf_data[0][1])

10 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0840

by Bastian Kuhn

Module: check_mk Branch: master Commit: fd5061788dac5c81451157133c0495d3623ba855 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd5061788dac5c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 31 17:39:53 2014 +0100 Updated bug entries #0840 --- .bugs/840 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/840 b/.bugs/840 new file mode 100644 index 0000000..de116e7 --- /dev/null +++ b/.bugs/840 @@ -0,0 +1,9 @@ +Title: Wato condition show only the name of a tag but not the group +Component: wato +State: open +Date: 2014-01-31 17:38:22 +Targetversion: 1.2.5i1 +Class: nastiness + +If you have multiple tags with the same title but in diffrent groups you cant see it in the +condition colums from which tag group this tag is

10 years, 8 months

Check_MK Git: check_mk: Cleanup diskstat includes declaration

by Mathias Kettner

Module: check_mk Branch: master Commit: 9779328c241973e8cbc7e2fab40653eef58f89f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9779328c241973… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 31 14:32:59 2014 +0100 Cleanup diskstat includes declaration --- checks/diskstat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/diskstat b/checks/diskstat index 41f4d3a..dcf097b 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -70,8 +70,6 @@ # Index 12 -- # of milliseconds spent doing I/Os # Index 13 -- weighted # of milliseconds spent doing I/Os -check_includes['diskstat'] = [ "diskstat.include" ] - # Convert information to generic format also generated # by winperf_phydisk # [ now, [( disk, readctr, writectr ), ... ]] @@ -152,4 +150,6 @@ check_info["diskstat"] = { 'service_description': 'Disk IO %s', 'has_perfdata': True, 'group': 'disk_io', + 'includes': [ "diskstat.include" ], } +

10 years, 8 months

Check_MK Git: check_mk: FIX fileinfo.groups: new date pattern is now available for inventory check as well

by Götz Golla

Module: check_mk Branch: master Commit: 2f8fa0673858c90857d9db6dfc02c6278634a770 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f8fa0673858c9… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 31 13:44:27 2014 +0100 FIX fileinfo.groups: new date pattern is now available for inventory check as well --- .werks/577 | 8 +++++++ ChangeLog | 1 + checks/fileinfo | 62 ++++++++++++++++++++++++++++++++----------------------- 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/.werks/577 b/.werks/577 new file mode 100644 index 0000000..2ead16f --- /dev/null +++ b/.werks/577 @@ -0,0 +1,8 @@ +Title: fileinfo.groups: new date pattern is now available for inventory check as well +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1391172155 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 47c4cd9..9419a1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -147,6 +147,7 @@ * 0262 FIX: ps: Now able to skip disabled "Process Inventory" rules... * 0264 FIX: printer_supply_ricoh: now reports correct filling levels... * 0575 FIX: cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: improved handling of warning state... + * 0577 FIX: fileinfo.groups: new date pattern is now available for inventory check as well Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/fileinfo b/checks/fileinfo index 59b1c43..662176a 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -45,11 +45,13 @@ fileinfo_groups = [] def inventory_fileinfo(info, case): inventory = [] added_groups = [] + if info: + reftime = int(info[0][0]) for line in info: if len(line) >= 3: if line[1] == "missing": continue - groups = fileinfo_groups_of_file(line[0]) + groups = fileinfo_groups_of_file(line[0], reftime) if case == 'single' and not groups: inventory.append((line[0], {})); @@ -60,15 +62,26 @@ def inventory_fileinfo(info, case): inventory.append((group, {})) return inventory -def fileinfo_groups_of_file(check_filename): +def fileinfo_process_date(pattern,reftime): + disect = re.match('(/.*/)\$DATE:((?:%\w.?){1,})\$(.*)',pattern) + if disect: + prefix = disect.group(1) + datepattern = time.strftime(disect.group(2),time.localtime(reftime)) + postfix = disect.group(3) + pattern = prefix+datepattern+postfix + return pattern + +def fileinfo_groups_of_file(check_filename,reftime): import fnmatch groups = [] for line in host_extra_conf(g_hostname, fileinfo_groups): for group_name, pattern in line: - if type(pattern) == str: + if type(pattern) == str: # support old format pattern = ( pattern, '' ) - if fnmatch.fnmatch(check_filename, pattern[0]) \ - and not fnmatch.fnmatch(check_filename, pattern[1]): + inclusion, exclusion = pattern + inclusion = fileinfo_process_date(inclusion,reftime) + if fnmatch.fnmatch(check_filename, inclusion) \ + and not fnmatch.fnmatch(check_filename, exclusion): groups.append(group_name) return groups @@ -100,7 +113,7 @@ def fileinfo_groups_precompile(hostname, item, params): for line in host_extra_conf(hostname, fileinfo_groups): for group_name, pattern in line: if group_name == item: - if type(pattern) == str: + if type(pattern) == str: # support old format pattern = ( pattern, '' ) patterns.append(pattern) params['precompiled_patterns'] = patterns @@ -130,13 +143,10 @@ def check_fileinfo_groups(item, params, info): for line in info[1:]: for pattern in params['precompiled_patterns']: inclusion, exclusion = pattern - disect = re.match('(/.*/)\$DATE:((?:%\w.?){1,})\$(.*)',inclusion) - if disect: - prefix = disect.group(1) - datepattern = time.strftime(disect.group(2),time.localtime(reftime)) - postfix = disect.group(3) - inclusion = prefix+datepattern+postfix - date_inclusion = inclusion + inclusion_tmp = fileinfo_process_date(inclusion,reftime) + if inclusion != inclusion_tmp: + inclusion = inclusion_tmp + date_inclusion = inclusion_tmp if fnmatch.fnmatch(line[0], inclusion) and str(line[1]) != 'missing' \ and not fnmatch.fnmatch(line[0], exclusion): size = int(line[1]) @@ -154,7 +164,6 @@ def check_fileinfo_groups(item, params, info): else: age_oldest = max(age_oldest, age) age_newest = min(age_newest, age) - count_all += 1 if age_oldest == None: @@ -184,18 +193,19 @@ def fileinfo_check_function(check_definition, params): perfdata = [] for what, val, verbfunc in check_definition: infos.append("%s is %s" % (what, verbfunc(val))) - warn, crit = "", "" - for how, comp, cfunc in [ ("min", "<", operator.lt), ("max", ">", operator.gt) ]: - p = params.get(how + what) - if p: - warn, crit = p - if cfunc(val, crit): - state = 2 - infos[-1] += " (%s %s)(!!)" % (comp, verbfunc(crit)) - elif cfunc(val, warn): - state = max(state, 1) - infos[-1] += " (%s %s)(!)" % (comp, verbfunc(warn)) - perfdata.append((what, val, warn, crit)) + if type(val) == int: # because strings go into infos but not into perfdata + warn, crit = "", "" + for how, comp, cfunc in [ ("min", "<", operator.lt), ("max", ">", operator.gt) ]: + p = params.get(how + what) + if p: + warn, crit = p + if cfunc(val, crit): + state = 2 + infos[-1] += " (%s %s)(!!)" % (comp, verbfunc(crit)) + elif cfunc(val, warn): + state = max(state, 1) + infos[-1] += " (%s %s)(!)" % (comp, verbfunc(warn)) + perfdata.append((what, val, warn, crit)) infotext = ", ".join(infos) return (state, infotext, perfdata)

10 years, 8 months

Check_MK Git: check_mk: emc_isilon.nodehealth: new check for EMC Isilon Storage systems: NodeHealth

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 9ea132479a9e0afc68561aacaa76e07646b89466 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ea132479a9e0a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jan 31 12:56:04 2014 +0100 emc_isilon.nodehealth: new check for EMC Isilon Storage systems: NodeHealth --- .werks/698 | 8 ++++++++ ChangeLog | 1 + checkman/emc_isilon.nodehealth | 16 ++++++++++++++++ checks/emc_isilon | 37 ++++++++++++++++++++++++++++++++++--- 4 files changed, 59 insertions(+), 3 deletions(-) diff --git a/.werks/698 b/.werks/698 new file mode 100644 index 0000000..67d7cda --- /dev/null +++ b/.werks/698 @@ -0,0 +1,8 @@ +Title: emc_isilon.nodehealth: new check for EMC Isilon Storage systems: NodeHealth +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1391169308 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a41518b..265c049 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * 0574 if64: check now supports clustering... * 0576 fileinfo.groups: new feature to include current date in file pattern * 0130 Support of new Firmware version of various Fujitsu Sotarge Systems + * 0698 emc_isilon.nodehealth: new check for EMC Isilon Storage systems: NodeHealth * 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/emc_isilon.nodehealth b/checkman/emc_isilon.nodehealth new file mode 100644 index 0000000..9899d2f --- /dev/null +++ b/checkman/emc_isilon.nodehealth @@ -0,0 +1,16 @@ +title: EMC Isilon: NodeHealth +agents: snmp +catalog: hw/storagehw/emc +license: GPL +distribution: check_mk +description: + Checks the NodeHealth (Overall Status) of an EMC Isilon Storage + Node as reported by SNMP. + + Returns {OK} on status ok, {CRIT} on status attn, down or invalid + and {UNKN} on every other status. + +inventory: + Finds exactly one service on each EMC Isilon Node, named + Node Health + diff --git a/checks/emc_isilon b/checks/emc_isilon index e04d971..5ea4548 100644 --- a/checks/emc_isilon +++ b/checks/emc_isilon @@ -24,9 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -emc_isilon_info = [(".1.3.6.1.4.1.12124.1.1", [1, 2, 5, 6]), - # clusterName, clusterHealth, configuredNodes, onlineNodes - (".1.3.6.1.4.1.12124.2.1", [1]), # nodeName +emc_isilon_info = [(".1.3.6.1.4.1.12124.1.1", [1, # clusterName + 2, # clusterHealth + 5, # configuredNodes + 6]), # onlineNodes + (".1.3.6.1.4.1.12124.2.1", [1, # nodeName + 2]), # nodeHealth ] def emc_isilon_scan(oid): @@ -59,6 +62,34 @@ check_info["emc_isilon.clusterhealth"] = { } #. +# .--NodeHealth------------------------------------------------------. + +def inventory_emc_isilon_nodehealth(info): + return [(None, None)] + +def check_emc_isilon_nodehealth(item, _no_params, info): + status=int(info[1][0][1]) + statusmap = ("ok", "attn", "down", "invalid") + nodename=info[1][0][0] + if status >= len(statusmap): + return 3, "nodeHealth reports unidentified status %s" % status + else: + if status == 0: + rc = 0 + else: + rc = 2 + return rc, "nodeHealth for %s reports status %s" % (nodename, statusmap[status]) + +check_info["emc_isilon.nodehealth"] = { + "check_function" : check_emc_isilon_nodehealth, + "inventory_function" : inventory_emc_isilon_nodehealth, + "service_description" : "Node Health", + "has_perfdata" : False, + "snmp_info" : emc_isilon_info, + "snmp_scan_function" : emc_isilon_scan +} + +#. # .--Nodes------------------------------------------------------. def inventory_emc_isilon_nodes(info):

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits