Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: Cleaned up new omd_apache check

by Lars Michelsen

Module: check_mk Branch: master Commit: 1afe93712edd8a4dd1b8bc0c945a11e028cd0d7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1afe93712edd8a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 1 10:46:18 2015 +0200 Cleaned up new omd_apache check --- agents/check_mk_agent.linux | 11 +++++++++++ checks/omd_apache | 10 ++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index aa53d27..af18cbe 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -531,6 +531,17 @@ then grep -v '^#' < $statefile fi done + + echo '<<<omd_apache:sep(124)>>>' + for statsfile in /omd/sites/*/var/log/apache/stats; do + if [ -e "$statsfile" ] ; then + site=${statsfile%/var/log*} + site=${site#/omd/sites/} + echo "[$site]" + cat $statsfile + > $statsfile + fi + done fi # Status of Check_MK Notification Spooler diff --git a/checks/omd_apache b/checks/omd_apache index b90263e..15505fe 100644 --- a/checks/omd_apache +++ b/checks/omd_apache @@ -49,16 +49,22 @@ def inventory_omd_apache(info): yield line[0][1:-1], None def check_omd_apache(item, _no_params, info): + # First initialize all possible values to be able to always report all perf keys + stats = {'requests': {}, 'secs': {}, 'bytes': {}} + for key, pattern in omd_apache_patterns: + stats['requests'][key] = 0 + stats['secs'][key] = 0 + stats['bytes'][key] = 0 + active = False found = False - stats = {'requests': {}, 'secs': {}, 'bytes': {}} for line in info: if line[0] == '[' + item + ']': active = True elif active and line[0] == '[': break elif active: - method, url, status, size_bytes, microsec = line + url, status, size_bytes, microsec = line for key, pattern in omd_apache_patterns: # make url relative to site directory if regex(pattern).search(url[len('/'+item+'/'):]):

9 years

Check_MK Git: check_mk: Added seconds processing and bytes graph for omd_apache status check

by Lars Michelsen

Module: check_mk Branch: master Commit: 8cb4fa821a860627ca15b79b2842475ddc160a02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cb4fa821a8606… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 1 11:00:28 2015 +0200 Added seconds processing and bytes graph for omd_apache status check --- web/plugins/metrics/check_mk.py | 219 +++++++++++++++++++++++---------------- 1 file changed, 130 insertions(+), 89 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 92db6aa..69498cf 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1076,83 +1076,84 @@ metric_info["call_legs"] = { "color" : "#60bbbb", } -metric_info["requests_cmk_views"] = { - "title" : _("%s Requests/s") % "Views", - "unit" : "1/s", - "color": "#ff8080", -} - -metric_info["requests_cmk_wato"] = { - "title" : _("%s Requests/s") % "WATO", - "unit" : "1/s", - "color": "#377cab", -} - -metric_info["requests_cmk_bi"] = { - "title" : _("%s Requests/s") % "BI", - "unit" : "1/s", - "color": "#4eb0f2", -} - -metric_info["requests_cmk_snapins"] = { - "title" : _("%s Requests/s") % "Snapins", - "unit" : "1/s", - "color": "#ff4040", -} - -metric_info["requests_cmk_dashboards"] = { - "title" : _("%s Requests/s") % "Dashboards", - "unit" : "1/s", - "color": "#4040ff", -} - -metric_info["requests_cmk_other"] = { - "title" : _("%s Requests/s") % "Other", - "unit" : "1/s", - "color": "#5bb9eb", -} - -metric_info["requests_nagvis_snapin"] = { - "title" : _("%s Requests/s") % "NagVis Snapin", - "unit" : "1/s", - "color": "#f2904e", -} - -metric_info["requests_nagvis_ajax"] = { - "title" : _("%s Requests/s") % "NagVis AJAX", - "unit" : "1/s", - "color": "#af91eb", -} - -metric_info["requests_nagvis_other"] = { - "title" : _("%s Requests/s") % "NagVis Other", - "unit" : "1/s", - "color": "#f2df40", -} - -metric_info["requests_images"] = { - "title" : _("%s Requests/s") % "Image", - "unit" : "1/s", - "color": "#91cceb", -} - -metric_info["requests_styles"] = { - "title" : _("%s Requests/s") % "Styles", - "unit" : "1/s", - "color": "#c6f24e", -} - -metric_info["requests_scripts"] = { - "title" : _("%s Requests/s") % "Scripts", - "unit" : "1/s", - "color": "#4ef26c", -} - -metric_info["requests_other"] = { - "title" : _("%s Requests/s") % "Other", - "unit" : "1/s", - "color": "#4eeaf2", -} +for ty, unit in [ ("requests", "1/s"), ("bytes", "bytes/s"), ("secs", "1/s") ]: + metric_info[ty+"_cmk_views"] = { + "title" : "Check_MK: Views", + "unit" : unit, + "color" : "#ff8080", + } + + metric_info[ty+"_cmk_wato"] = { + "title" : "Check_MK: WATO", + "unit" : unit, + "color" : "#377cab", + } + + metric_info[ty+"_cmk_bi"] = { + "title" : "Check_MK: BI", + "unit" : unit, + "color" : "#4eb0f2", + } + + metric_info[ty+"_cmk_snapins"] = { + "title" : "Check_MK: Snapins", + "unit" : unit, + "color" : "#ff4040", + } + + metric_info[ty+"_cmk_dashboards"] = { + "title" : "Check_MK: Dashboards", + "unit" : unit, + "color" : "#4040ff", + } + + metric_info[ty+"_cmk_other"] = { + "title" : "Check_MK: Other", + "unit" : unit, + "color" : "#5bb9eb", + } + + metric_info[ty+"_nagvis_snapin"] = { + "title" : "NagVis: Snapin", + "unit" : unit, + "color" : "#f2904e", + } + + metric_info[ty+"_nagvis_ajax"] = { + "title" : "NagVis: AJAX", + "unit" : unit, + "color" : "#af91eb", + } + + metric_info[ty+"_nagvis_other"] = { + "title" : "NagVis: Other", + "unit" : unit, + "color" : "#f2df40", + } + + metric_info[ty+"_images"] = { + "title" : "Image", + "unit" : unit, + "color" : "#91cceb", + } + + metric_info[ty+"_styles"] = { + "title" : "Styles", + "unit" : unit, + "color" : "#c6f24e", + } + + metric_info[ty+"_scripts"] = { + "title" : "Scripts", + "unit" : unit, + "color" : "#4ef26c", + } + + metric_info[ty+"_other"] = { + "title" : "Other", + "unit" : unit, + "color" : "#4eeaf2", + } #. # .--Checks--------------------------------------------------------------. @@ -2130,18 +2131,58 @@ graph_info.append({ "title" : _("Handled Requests"), "metrics" : [ ("requests_cmk_views", "stack"), - #("requests_cmk_wato'", "stack"), - #("requests_cmk_bi", "stack"), - #("requests_cmk_snapins", "stack"), - #("requests_cmk_dashboards", "stack"), - #("requests_cmk_other", "stack"), - #("requests_nagvis_snapin", "stack"), - #("requests_nagvis_ajax", "stack"), - #("requests_nagvis_other", "stack"), - #("requests_images", "stack"), - #("requests_styles", "stack"), - #("requests_scripts", "stack"), - #("requests_other", "stack"), + ("requests_cmk_wato", "stack"), + ("requests_cmk_bi", "stack"), + ("requests_cmk_snapins", "stack"), + ("requests_cmk_dashboards", "stack"), + ("requests_cmk_other", "stack"), + ("requests_nagvis_snapin", "stack"), + ("requests_nagvis_ajax", "stack"), + ("requests_nagvis_other", "stack"), + ("requests_images", "stack"), + ("requests_styles", "stack"), + ("requests_scripts", "stack"), + ("requests_other", "stack"), ], + "omit_zero_metrics" : True, }) +graph_info.append({ + "title" : _("Seconds serving"), + "metrics" : [ + ("secs_cmk_views", "stack"), + ("secs_cmk_wato", "stack"), + ("secs_cmk_bi", "stack"), + ("secs_cmk_snapins", "stack"), + ("secs_cmk_dashboards", "stack"), + ("secs_cmk_other", "stack"), + ("secs_nagvis_snapin", "stack"), + ("secs_nagvis_ajax", "stack"), + ("secs_nagvis_other", "stack"), + ("secs_images", "stack"), + ("secs_styles", "stack"), + ("secs_scripts", "stack"), + ("secs_other", "stack"), + ], + "omit_zero_metrics" : True, +}) + +graph_info.append({ + "title" : _("Bytes sent"), + "metrics" : [ + ("bytes_cmk_views", "stack"), + ("bytes_cmk_wato", "stack"), + ("bytes_cmk_bi", "stack"), + ("bytes_cmk_snapins", "stack"), + ("bytes_cmk_dashboards", "stack"), + ("bytes_cmk_other", "stack"), + ("bytes_nagvis_snapin", "stack"), + ("bytes_nagvis_ajax", "stack"), + ("bytes_nagvis_other", "stack"), + ("bytes_images", "stack"), + ("bytes_styles", "stack"), + ("bytes_scripts", "stack"), + ("bytes_other", "stack"), + ], + "omit_zero_metrics" : True, +})

9 years

Check_MK Git: check_mk: sni_octopuse_cpu: formalize for new graph system

by Mathias Kettner

Module: check_mk Branch: master Commit: 80ac03324b09820303d28eed547b05b0960859a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80ac03324b0982… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 1 10:45:20 2015 +0200 sni_octopuse_cpu: formalize for new graph system --- checks/sni_octopuse_cpu | 16 +++------------- pnp-templates/check_mk-sni_octopuse_cpu.php | 1 - web/plugins/metrics/check_mk.py | 2 ++ 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/checks/sni_octopuse_cpu b/checks/sni_octopuse_cpu index cb7b6e3..ae358b4 100644 --- a/checks/sni_octopuse_cpu +++ b/checks/sni_octopuse_cpu @@ -25,25 +25,15 @@ # Boston, MA 02110-1301 USA. -#1.3.6.1.4.1.231.7.2.9.1.7 -#CPU util -#( 0..100 ) - def inventory_octopus_cpu(info): - # are there only 1-cpu models? if len(info[0][0]) == 1: - # no level so far, it should work ok even under load return [(None, None)] def check_octopus_cpu(_no_item, _no_params_info, info): - try: - # need to un-triple pack here. - cpu_perc = int(info[0][0][0]) - perfdata = [ ("util", "%.3f" % cpu_perc) ] - return (0, "CPU utilization is %d%%. (OK from 0-100)" % cpu_perc, perfdata) - except: - return (3, "UKNW - invalid data received") + cpu_perc = int(info[0][0][0]) + perfdata = [ ("util", "%.3f" % cpu_perc) ] + return 0, "CPU utilization is %d%%" % cpu_perc, perfdata check_info['sni_octopuse_cpu'] = { diff --git a/pnp-templates/check_mk-sni_octopuse_cpu.php b/pnp-templates/check_mk-sni_octopuse_cpu.php deleted file mode 120000 index aa15f0d..0000000 --- a/pnp-templates/check_mk-sni_octopuse_cpu.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-winperf.cpuusage.php \ No newline at end of file diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 92608cd..4c794e7 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1284,6 +1284,7 @@ check_metrics["check_mk-ucd_cpu_util"] = { "wait" : { " check_metrics["check_mk-vms_cpu"] = { "wait" : { "name" : "io_wait" } } check_metrics["check_mk-vms_sys.util"] = { "wait" : { "name" : "io_wait" } } check_metrics["check_mk-winperf.cpuusage"] = { "cpuusage" : { "name" : "util" } } +check_metrics["check_mk-sni_octopuse_cpu"] = {} check_metrics["check_mk-mbg_lantime_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 }} # convert us -> sec check_metrics["check_mk-mbg_lantime_ng_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 }} # convert us -> sec @@ -1531,6 +1532,7 @@ perfometer_info.append({ "exponent" : 2, }) +# TODO: :max should be the default? perfometer_info.append(("linear", ( [ "used_dhcp_leases" ], "used_dhcp_leases:max", None))) perfometer_info.append(("stacked", [

9 years

Check_MK Git: check_mk: winperf.cpuusage: add formalization for new graph template

by Mathias Kettner

Module: check_mk Branch: master Commit: fb839a0878ae07459092f3c69dc731ba994b0c66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb839a0878ae07… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 1 10:38:05 2015 +0200 winperf.cpuusage: add formalization for new graph template --- pnp-templates/check_mk-winperf.cpuusage.php | 33 --------------------------- web/plugins/metrics/check_mk.py | 12 ++++++++++ 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/pnp-templates/check_mk-winperf.cpuusage.php b/pnp-templates/check_mk-winperf.cpuusage.php deleted file mode 100644 index dd7dbfb..0000000 --- a/pnp-templates/check_mk-winperf.cpuusage.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 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. - - -$opt[1] = "--vertical-label 'Percent' -l0 -u100 --title \"CPU Utilization of $hostname\" "; - -$def[1] = "DEF:usage=$RRDFILE[1]:$DS[1]:AVERAGE "; -$def[1] .= "AREA:usage#60f020:\"CPU utilization\" "; -$def[1] .= "LINE:usage#40d010 "; - -?> diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 9029d9a..92608cd 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1283,6 +1283,7 @@ check_metrics["check_mk-lparstat_aix.cpu_util"] = { "wait" : { " check_metrics["check_mk-ucd_cpu_util"] = { "wait" : { "name" : "io_wait" } } check_metrics["check_mk-vms_cpu"] = { "wait" : { "name" : "io_wait" } } check_metrics["check_mk-vms_sys.util"] = { "wait" : { "name" : "io_wait" } } +check_metrics["check_mk-winperf.cpuusage"] = { "cpuusage" : { "name" : "util" } } check_metrics["check_mk-mbg_lantime_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 }} # convert us -> sec check_metrics["check_mk-mbg_lantime_ng_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 }} # convert us -> sec @@ -1616,6 +1617,17 @@ graph_info.append({ ] }) +graph_info.append({ + "metrics" : [ + ( "util", "area" ), + ], + "scalars" : [ + "util:warn", + "util:crit", + ], + "range" : (0, 100), +}) + graph_info.append({ "metrics" : [

9 years

Check_MK Git: check_mk: Changed werk description

by Bastian Kuhn

Module: check_mk Branch: master Commit: e112582177e3f2e076770629b09529f8e350c84e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e112582177e3f2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 1 09:10:12 2015 +0200 Changed werk description --- .werks/1252 | 2 +- ChangeLog | 2 +- checkman/hitachi_hus_status | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.werks/1252 b/.werks/1252 index e349d1a..775891b 100644 --- a/.werks/1252 +++ b/.werks/1252 @@ -1,4 +1,4 @@ -Title: hitachi_hus_status: New check to monitor drive status on Hitachi Hus Systems +Title: hitachi_hus_status: New check to monitor global status on Hitachi Hus Systems Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 1025d35..3e61790 100644 --- a/ChangeLog +++ b/ChangeLog @@ -198,7 +198,7 @@ * 1251 lvm_pvs, lvm_vgs: New Checks for LVM volume groups and physical volumes... * 2280 agent_vsphere: now provides more information if the login attempt fails... * 2116 bluenet_sensor, bluenet_sensor.hum: new checks to monitor temperature and humidity of Bachmann Bluenet PDUs - * 1252 hitachi_hus_status: New check to monitor drive status on Hitachi Hus Systems + * 1252 hitachi_hus_status: New check to monitor global status on Hitachi Hus Systems * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/hitachi_hus_status b/checkman/hitachi_hus_status index 6cac80e..f424dd7 100644 --- a/checkman/hitachi_hus_status +++ b/checkman/hitachi_hus_status @@ -1,11 +1,11 @@ -title: Hitachi HUS: Global Drive Status +title: Hitachi HUS: Global Status agents: snmp catalog: hw/storagehw/hitachi license: GPL distribution: check_mk description: - This Check monitors the total state of disks (also shown as error code on the device display). + This Check monitors the total state of the device (also shown as error code on the device display). It reports the global state as number and detailed information with the name of affected components. inventory:

9 years

Check_MK Git: check_mk: alcatel_timetra_chassis: Code cleanup

by Bastian Kuhn

Module: check_mk Branch: master Commit: 01b19fa043ce3ea89c03300ce11261d42f7c8839 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01b19fa043ce3e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 1 08:46:08 2015 +0200 alcatel_timetra_chassis: Code cleanup --- checks/alcatel_timetra_chassis | 67 ++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 40 deletions(-) diff --git a/checks/alcatel_timetra_chassis b/checks/alcatel_timetra_chassis index 825b883..4563ceb 100644 --- a/checks/alcatel_timetra_chassis +++ b/checks/alcatel_timetra_chassis @@ -32,34 +32,34 @@ def inventory_alcatel_timetra_chassis(info): def check_alcatel_timetra_chassis(item, _no_params, info): admin_states = { - 1 : "noop", - 2 : "inService", - 3 : "outOfService", - 4 : "diagnose", - 5 : "operateSwitch", + 1 : ( 0, "noop"), + 2 : ( 0, "in service"), + 3 : ( 1, "out of service"), + 4 : ( 2, "diagnose"), + 5 : ( 2, "operate switch"), } oper_states = { - 1 : "unknown", - 2 : "inService", - 3 : "outOfService", - 4 : "diagnosing", - 5 : "failed", - 6 : "booting", - 7 : "empty", - 8 : "provisioned", - 9 : "unprovisioned", - 10 : "upgrade", - 11 : "downgrade", - 12 : "inServiceUpgrade", - 13 : "inServiceDowngrade", - 14 : "resetPending", + 1 : ( 3, "unknown"), + 2 : ( 0, "in service"), + 3 : ( 2, "out of service"), + 4 : ( 1, "diagnosing"), + 5 : ( 2, "failed"), + 6 : ( 1, "booting"), + 7 : ( 3, "empty"), + 8 : ( 0, "provisioned"), + 9 : ( 3, "unprovisioned"), + 10 : ( 1, "upgrade"), + 11 : ( 1, "downgrade"), + 12 : ( 1, "in service upgrade"), + 13 : ( 1, "in service downgrade"), + 14 : ( 1, "reset pending"), } alarm_states = { - 0 : "unknown", - 1 : "alarmActive", - 2 : "alarmCleared", + 0 : ( 0, "unknown"), + 1 : ( 2, "alarm active"), + 2 : ( 0, "alarm cleared"), } for line in info: @@ -67,26 +67,13 @@ def check_alcatel_timetra_chassis(item, _no_params, info): adminstate, operstate, alarmstate = map(int, line[1:]) state = 0 if operstate != adminstate: - if adminstate in [4, 5]: - state = 2 - elif adminstate in [3, 1]: - state = 1 - yield state, "Admin State: %s" % admin_states[adminstate] + if admin_states[adminstate][0] != 0: + yield admin_states[adminstate][0], "Admin state: %s" % admin_states[adminstate][1] - state = 0 - if operstate in [5, 3]: - state = 2 - elif operstate in [4, 6, 10, 11, 12, 13, 14]: - state = 1 - elif operstate not in [2, 8]: - state = 3 - yield state, "Oper State: %s" % oper_states[operstate] + yield oper_states[operstate][0], "Operational state: %s" % oper_states[operstate][1] - if alarmstate not in [0,2]: - state = 0 - if alarmstate == 1: - state = 2 - yield state, "Alarms State: %s" % alarm_states[alarmstate] + if alarm_states[alarmstate][0] != 0: + yield alarm_states[alarmstate], "Alarm state: %s" % alarm_states[alarmstate][1] return

9 years

Check_MK Git: check_mk: #1252 hitachi_hus_status: New check to monitor drive status on Hitachi Hus Systems

by Bastian Kuhn

Module: check_mk Branch: master Commit: 53f4a90bb33ad70d239281a7e6bd28cebca14f5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53f4a90bb33ad7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 1 08:25:09 2015 +0200 #1252 hitachi_hus_status: New check to monitor drive status on Hitachi Hus Systems --- .werks/1252 | 9 +++++++++ ChangeLog | 1 + checkman/hitachi_hus_status | 12 ++++++++++++ checks/hitachi_hus_status | 31 +++++++++++++++---------------- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/.werks/1252 b/.werks/1252 new file mode 100644 index 0000000..e349d1a --- /dev/null +++ b/.werks/1252 @@ -0,0 +1,9 @@ +Title: hitachi_hus_status: New check to monitor drive status on Hitachi Hus Systems +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1433139880 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1b55da4..1025d35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -198,6 +198,7 @@ * 1251 lvm_pvs, lvm_vgs: New Checks for LVM volume groups and physical volumes... * 2280 agent_vsphere: now provides more information if the login attempt fails... * 2116 bluenet_sensor, bluenet_sensor.hum: new checks to monitor temperature and humidity of Bachmann Bluenet PDUs + * 1252 hitachi_hus_status: New check to monitor drive status on Hitachi Hus Systems * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/hitachi_hus_status b/checkman/hitachi_hus_status new file mode 100644 index 0000000..6cac80e --- /dev/null +++ b/checkman/hitachi_hus_status @@ -0,0 +1,12 @@ +title: Hitachi HUS: Global Drive Status +agents: snmp +catalog: hw/storagehw/hitachi +license: GPL +distribution: check_mk +description: + + This Check monitors the total state of disks (also shown as error code on the device display). + It reports the global state as number and detailed information with the name of affected components. + +inventory: + On service will be created diff --git a/checks/hitachi_hus_status b/checks/hitachi_hus_status index 8763928..ef387d6 100644 --- a/checks/hitachi_hus_status +++ b/checks/hitachi_hus_status @@ -25,10 +25,10 @@ # Boston, MA 02110-1301 USA. -def inventory_hitatchi_hus_status(info): +def inventory_hitatchi_hus_status2(info): return [ (None, None)] -def check_hitatchi_hus_status(_no_item, _no_params, info): +def check_hitatchi_hus_status2(_no_item, _no_params, info): status_values = { 0 : ( 0, "Array in normal status" ), 1 : ( 2, "Drive blocked" ), @@ -45,23 +45,22 @@ def check_hitatchi_hus_status(_no_item, _no_params, info): 131072 : ( 2, "Power supply failure" ), 1048576 : ( 1, "Fan alarm" ), 4194304 : ( 2, "Host I/O module failure" ), - 838608 : ( 2, "Management module failure" ), + 8388608 : ( 2, "Management module failure" ), 16777216 : ( 2, "Host connector alarm" ), - 268436456 : ( 2, "Host connector alarm" ), + 268435456 : ( 2, "Host connector alarm" ), } + if int(info[0][0]) == 0: + yield 0, "Array in normal status" + else: + yield 0, "Errorcode: %s" % info[0][0] + for status, output in status_values.items(): + state, message = output + if status & int(info[0][0]): + yield state, message - for status, output in status_values.items(): - state, message = output - found_error = False - if status & int(info[0][0]): - found_error = True - yield state, message - if found_error: - yield 0, "Array in normal status" - -check_info["hitatchi_hus_status"] = { - "check_function" : check_hitatchi_hus_status, - "inventory_function" : inventory_hitatchi_hus_status, +check_info["hitatchi_hus_status2"] = { + "check_function" : check_hitatchi_hus_status2, + "inventory_function" : inventory_hitatchi_hus_status2, "service_description" : "Status", "snmp_info" : (".1.3.6.1.4.1.116.5.11.1.2.2", [ 1 ]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.116"),

9 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015