Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: ibm_svc_portsas: new check and extended special agent for IBM SVC / Storwize V3700 / V7000 devices

by Goetz Golla

Module: check_mk Branch: master Commit: 7b69bcf4bd5ca7b459a244ab86d983234e3b2153 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b69bcf4bd5ca7… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jan 21 16:53:10 2015 +0100 ibm_svc_portsas: new check and extended special agent for IBM SVC / Storwize V3700 / V7000 devices --- .werks/1857 | 9 +++++++ ChangeLog | 1 + agents/special/agent_ibmsvc | 8 ++++--- checkman/ibm_svc_portsas | 22 +++++++++++++++++ checks/ibm_svc_portsas | 55 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 3 deletions(-) diff --git a/.werks/1857 b/.werks/1857 new file mode 100644 index 0000000..3186844 --- /dev/null +++ b/.werks/1857 @@ -0,0 +1,9 @@ +Title: ibm_svc_portsas: new check and extended special agent for IBM SVC / Storwize V3700 / V7000 devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1421855429 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 41d37fd..7281e67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ NOTE: Please refer to the migration notes! * 1888 bintec_sensors.fan: No longer outputs performance data, now configured via "fan" rule... NOTE: Please refer to the migration notes! + * 1857 ibm_svc_portsas: new check and extended special agent for IBM SVC / Storwize V3700 / V7000 devices * 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/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index 5a43d43..427cf2f 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -62,9 +62,9 @@ OPTIONS: which may contain the keywords "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", "lsnodestats", "lssystem", "lssystemstats", "lseventlog", "lsportfc" - "lsenclosure", "lsenclosurestats", "lsarray" or "all" - to define which information should be queried from - the device. + "lsenclosure", "lsenclosurestats", "lsarray", "lsportsas" + or "all" to define which information should be queried + from the device. You can define to use only view of them to optimize performance. The default is "all". @@ -120,6 +120,8 @@ command_options = { "command" : "lsenclosurestats -nohdr -delim :"}, "lsarray" : {"section_header" : "ibm_svc_array", "active" : False, "command" : "lsarray -nohdr -delim :"}, + "lsportsas" : {"section_header" : "ibm_svc_portsas", "active" : False, + "command" : "lsportsas -nohdr -delim :"}, } for o,a in opts: diff --git a/checkman/ibm_svc_portsas b/checkman/ibm_svc_portsas new file mode 100644 index 0000000..ffca097 --- /dev/null +++ b/checkman/ibm_svc_portsas @@ -0,0 +1,22 @@ +title: IBM SVC / Storwize V3700 / V7000: Status of SAS Ports +agents: ibm_svc +catalog: hw/storagehw/ibm +license: GPL +distribution: check_mk +description: + Checks the status of SAS Ports in an IBM SVC / Storwize V3700 / V7000 + device. + + Status {online} is {OK}, every other status is {CRIT}. + + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH keys. The Special Agent itself + can be configured by WATO. + +item: + The ID of the SAS Port. + +inventory: + Creates one check for every SAS Port in the IBM SVC / Storwize V3700 / V7000 device + with status not {offline_unconfigured}. diff --git a/checks/ibm_svc_portsas b/checks/ibm_svc_portsas new file mode 100644 index 0000000..7f3ef62 --- /dev/null +++ b/checks/ibm_svc_portsas @@ -0,0 +1,55 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + + +def inventory_ibm_svc_portsas(info): + for line in info: + if len(line) in (10, 12) and line[6] != "offline_unconfigured": + yield line[0], None + +def check_ibm_svc_portsas(item, _no_params, info): + for line in info: + if len(line) in (10, 12) and line[0] == item: + sasport_status = line[6] + sasport_speed = line[2] + sasport_type = line[9] + + infotext = "Status: %s" % sasport_status + if sasport_status == "online": + state = 0 + else: + state = 2 + infotext += "(!!)" + + infotext += ", Speed: %s, Type: %s" % (sasport_speed, sasport_type) + + return state, infotext + +check_info["ibm_svc_portsas"] = { + "check_function" : check_ibm_svc_portsas, + "inventory_function" : inventory_ibm_svc_portsas, + "service_description" : "SAS Port %s", +}

9 years, 8 months

Check_MK Git: check_mk: slight change werk text 1855

by Goetz Golla

Module: check_mk Branch: master Commit: 41faf034cfe3a15e83bd561a54d2fae86e527b35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41faf034cfe3a1… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jan 21 16:38:36 2015 +0100 slight change werk text 1855 --- .werks/1855 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/1855 b/.werks/1855 index b633755..e6bba0c 100644 --- a/.werks/1855 +++ b/.werks/1855 @@ -1,4 +1,4 @@ -Title: esx_systeminfo: new inventory check to retrieve info about the host operating system for ESX servers +Title: esx_systeminfo: new inventory plugin to retrieve info about the host operating system for ESX servers Level: 1 Component: inv Compatible: compat

9 years, 8 months

Check_MK Git: check_mk: noop on Changelog

by Goetz Golla

Module: check_mk Branch: master Commit: 5fc194672aeb3ce4a05637cd6d73d0812c8e8f37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fc194672aeb3c… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jan 21 16:42:21 2015 +0100 noop on Changelog --- ChangeLog | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3426c01..5b31962 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,13 +48,10 @@ NOTE: Please refer to the migration notes! * 1525 viprinet_temp: Now uses new Temperature WATO rule... NOTE: Please refer to the migration notes! -<<<<<<< HEAD - * 1526 climaveneta_fan: No longer outputs performance data, now configured via "fan" rule... - NOTE: Please refer to the migration notes! -======= * 1673 netapp_volumes: now able to configure levels by magic factor * 1854 netscaler_tcp_conns: new check to monitor tcp connections on Citrix Netscaler Loadbalancer Appliances ->>>>>>> 92eaa76066f0ba1122cb72f4f1f783d8c0439378 + * 1526 climaveneta_fan: No longer outputs performance data, now configured via "fan" rule... + NOTE: Please refer to the migration notes! * 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... @@ -166,7 +163,7 @@ HW/SW-Inventory: * 1846 Keep track of changes of software and hardware... - * 1855 esx_systeminfo: new inventory check to retrieve info about the host operating system for ESX servers + * 1855 esx_systeminfo: new inventory plugin to retrieve info about the host operating system for ESX servers * 1851 FIX: win_exefiles: inventory check can now handle time stamps in us english locale

9 years, 8 months

Check_MK Git: check_mk: Updated Changelog

by Konstantin Büttner

Module: check_mk Branch: master Commit: 093cb1fe63cffd9729a46f9feeacd03fdd8326d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=093cb1fe63cffd… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 21 16:37:37 2015 +0100 Updated Changelog --- .werks/1526 | 2 +- .werks/1888 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1526 b/.werks/1526 index 24e01c2..35a4d12 100644 --- a/.werks/1526 +++ b/.werks/1526 @@ -7,4 +7,4 @@ Date: 1421850987 Class: feature This check is now configured via a different WATO rule, so any old rules set will -no longer apply. Re-inventory required. +no longer apply. diff --git a/.werks/1888 b/.werks/1888 index fbd795d..126fcfe 100644 --- a/.werks/1888 +++ b/.werks/1888 @@ -6,4 +6,4 @@ Version: 1.2.7i1 Date: 1421853099 Class: feature -This check is now configured via a different WATO rule, so any old rules set will no longer apply. Re-inventory required. +This check is now configured via a different WATO rule, so any old rules set will no longer apply.

9 years, 8 months

Check_MK Git: check_mk: fan.include: Now can handle legacy dict parameters

by Konstantin Büttner

Module: check_mk Branch: master Commit: efb2b198c57940dbd169ffaa1238610ba8102849 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efb2b198c57940… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 21 16:35:55 2015 +0100 fan.include: Now can handle legacy dict parameters --- checks/fan.include | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/fan.include b/checks/fan.include index 6acb00d..f88e5ca 100644 --- a/checks/fan.include +++ b/checks/fan.include @@ -25,7 +25,10 @@ # Boston, MA 02110-1301 USA. def check_fan(rpm, params): - warn, crit = params + if type(params) == dict: + warn, crit = params["lower"] + else: + warn, crit = params message = "Speed at %d rpm" % rpm levelstext = " (warn/crit at %s/%s rpm)" % params if rpm < crit:

9 years, 8 months

Check_MK Git: check_mk: #1888 bintec_sensors.fan: No longer outputs performance data, now configured via "fan" rule

by Konstantin Büttner

Module: check_mk Branch: master Commit: c0cf3a4c994955c40e91c59ad9739c979369761c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0cf3a4c994955… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 21 16:13:01 2015 +0100 #1888 bintec_sensors.fan: No longer outputs performance data, now configured via "fan" rule This check is now configured via a different WATO rule, so any old rules set will no longer apply. Re-inventory required. --- .werks/1888 | 9 +++++++++ ChangeLog | 9 ++++----- checkman/bintec_sensors.fan | 26 ++++---------------------- checks/bintec_sensors | 21 ++++----------------- 4 files changed, 21 insertions(+), 44 deletions(-) diff --git a/.werks/1888 b/.werks/1888 new file mode 100644 index 0000000..fbd795d --- /dev/null +++ b/.werks/1888 @@ -0,0 +1,9 @@ +Title: bintec_sensors.fan: No longer outputs performance data, now configured via "fan" rule +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1421853099 +Class: feature + +This check is now configured via a different WATO rule, so any old rules set will no longer apply. Re-inventory required. diff --git a/ChangeLog b/ChangeLog index 3426c01..2e842a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,13 +48,12 @@ NOTE: Please refer to the migration notes! * 1525 viprinet_temp: Now uses new Temperature WATO rule... NOTE: Please refer to the migration notes! -<<<<<<< HEAD - * 1526 climaveneta_fan: No longer outputs performance data, now configured via "fan" rule... - NOTE: Please refer to the migration notes! -======= * 1673 netapp_volumes: now able to configure levels by magic factor * 1854 netscaler_tcp_conns: new check to monitor tcp connections on Citrix Netscaler Loadbalancer Appliances ->>>>>>> 92eaa76066f0ba1122cb72f4f1f783d8c0439378 + * 1526 climaveneta_fan: No longer outputs performance data, now configured via "fan" rule... + NOTE: Please refer to the migration notes! + * 1888 bintec_sensors.fan: No longer outputs performance data, now configured via "fan" rule... + NOTE: Please refer to the migration notes! * 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/bintec_sensors.fan b/checkman/bintec_sensors.fan index 3e65d61..4bcc3b2 100644 --- a/checkman/bintec_sensors.fan +++ b/checkman/bintec_sensors.fan @@ -6,33 +6,15 @@ distribution: check_mk description: Checks the Fan Speed of Bintec Routers. - Returns {WARN} or {CRIT} if the speed is above or equal given levels or it is - below or equal given levels. - item: The sensorDescr from SNMP. -examples: - # set new default levels - bintec_sensors_fan_default_levels = { "lower": ( 1, 1000), "upper": (9000, 10000) } - - # check Fan 1 of router1 with default levels - checks += [ - ("router1", "bintec_sensors.fan", 'Fan 1', bintec_sensors_fan_default_levels) - ] - perfdata: - One value: The speed of the fan in rpm, together with the upper and lower - levels for {WARN} and {CRIT}. + None inventory: - Creates one check per fan, concrete: One check for every sensor of sensorType 2 - (fan). + For each fan one service is created [parameters] -dict: key "lower" references a tuple with lower crit level and lower warn level. - key "upper" references a tuple with upper warn level and upper crit level. - -[configuration] -bintec_sensors_fan_default_levels (dict): - defaults to { "lower": ( 1000, 2000), "upper": (8000, 8400) +warn (int): Warning if speed is below +crit (int): Critical if speed is below diff --git a/checks/bintec_sensors b/checks/bintec_sensors index cf3874d..f9104f5 100644 --- a/checks/bintec_sensors +++ b/checks/bintec_sensors @@ -44,7 +44,7 @@ bintec_sensors_info = ( ".1.3.6.1.4.1.272.4.17.7.1.1.1", [ # | | # '----------------------------------------------------------------------' -bintec_sensors_fan_default_levels = { "lower": ( 1000, 2000), "upper": (8000, 8400) } +bintec_sensors_fan_default_levels = (2000, 1000) def inventory_bintec_sensors_fan(info): inventory = [] @@ -56,29 +56,16 @@ def inventory_bintec_sensors_fan(info): def check_bintec_sensors_fan(item, params, info): for sensor_id, sensor_descr, sensor_type, sensor_value, sensor_unit in info: if sensor_descr == item: - status = 0 - sensor_value = int(sensor_value) - if sensor_value <= params["lower"][1] or sensor_value >= params["upper"][0]: - status = 1 - if sensor_value <= params["lower"][0] or sensor_value >= params["upper"][1]: - status = 2 - - message = "%s is at %s %s" % (sensor_descr, sensor_value, sensor_unit) - perfdata = [ ("rpm", sensor_value, "%d:%d" % (params["lower"][1], params["upper"][0]), \ - "%d:%d" % (params["lower"][0], params["upper"][1]), 0) ] - - return status, message, perfdata - - return 3, "Sensor %s not found" % item + return check_fan(int(sensor_value), params) check_info["bintec_sensors.fan"] = { "check_function" : check_bintec_sensors_fan, "inventory_function" : inventory_bintec_sensors_fan, "service_description" : "%s", - "group" : "hw_fans", - "has_perfdata" : True, "snmp_info" : bintec_sensors_info, "snmp_scan_function" : bintec_sensors_scan, + "group" : "fan", + "includes" : [ "fan.include" ], } #.

9 years, 8 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1a5fb23bb39eb1a51b5db92abb30ae1cf2c9e179 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a5fb23bb39eb1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 21 16:10:51 2015 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6eaca3f..3964950 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1888 +1898

9 years, 8 months

Check_MK Git: check_mk: climaveneta_fan: Minor fix concerning default levels

by Konstantin Büttner

Module: check_mk Branch: master Commit: 71076f63a62026c92539a3ec0e6d07903d9e78a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71076f63a62026… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 21 15:57:20 2015 +0100 climaveneta_fan: Minor fix concerning default levels --- checks/climaveneta_fan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/climaveneta_fan b/checks/climaveneta_fan index 09d135a..385dd69 100644 --- a/checks/climaveneta_fan +++ b/checks/climaveneta_fan @@ -30,7 +30,7 @@ climaveneta_fan_default_levels = (200, 100) def inventory_climaveneta_fan(info): if len(info[0]) == 2: - return [ (1, climaveneta_fan_default_levels), (2, climaveneta_fan_default_levels) ] + return [ (1, "climaveneta_fan_default_levels"), (2, "climaveneta_fan_default_levels") ] def check_climaveneta_fan(item, params, info):

9 years, 8 months

Check_MK Git: check_mk: #1856 FIX ibm_svc_array ibm_svc_mdisk ibm_svc_mdiskgrp ibm_svc_portfc: made checks more robust for varying number of parameters of IBM SVC agent plugin

by Goetz Golla

Module: check_mk Branch: master Commit: d8f0fa7de0ae4667b17b9cdd3739e5628bf5e1a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8f0fa7de0ae46… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jan 21 15:54:11 2015 +0100 #1856 FIX ibm_svc_array ibm_svc_mdisk ibm_svc_mdiskgrp ibm_svc_portfc: made checks more robust for varying number of parameters of IBM SVC agent plugin The number of parameters returned by the IBM SVC agent plugin depends on the IBM SVC's version. This change makes the corresponding checks handle IBM SVC versions up to at least V7.4 --- .werks/1856 | 12 ++++++++++++ ChangeLog | 1 + checks/ibm_svc_array | 24 ++++++++++-------------- checks/ibm_svc_mdisk | 24 ++++++++++-------------- checks/ibm_svc_mdiskgrp | 43 +++++++++++++++++++------------------------ checks/ibm_svc_portfc | 21 +++++++++------------ 6 files changed, 61 insertions(+), 64 deletions(-) diff --git a/.werks/1856 b/.werks/1856 new file mode 100644 index 0000000..0e4b9bf --- /dev/null +++ b/.werks/1856 @@ -0,0 +1,12 @@ +Title: ibm_svc_array ibm_svc_mdisk ibm_svc_mdiskgrp ibm_svc_portfc: made checks more robust for varying number of parameters of IBM SVC agent plugin +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421851629 + +The number of parameters returned by the IBM SVC agent plugin depends on the IBM SVC's version. This change makes the corresponding checks +handle IBM SVC versions up to at least V7.4 + diff --git a/ChangeLog b/ChangeLog index 58b428d..68faea4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ * 1853 FIX: cisco_power, cisco_fan, cisco_temp_perf: fixed service description for some special cases... NOTE: Please refer to the migration notes! * 1671 FIX: windows agent: fixed gaps in eventlog monitoring after agent restart... + * 1856 FIX: ibm_svc_array ibm_svc_mdisk ibm_svc_mdiskgrp ibm_svc_portfc: made checks more robust for varying number of parameters of IBM SVC agent plugin... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/ibm_svc_array b/checks/ibm_svc_array index 9f9f280..cc247b6 100644 --- a/checks/ibm_svc_array +++ b/checks/ibm_svc_array @@ -33,23 +33,22 @@ def inventory_ibm_svc_array(info): - inventory = [] - for mdisk_id, mdisk_name, mdisk_status, mdisk_grp_id, mdisk_grp_name, capacity, \ - raid_status, raid_level, redundancy, strip_size, tier in info: - inventory.append( (mdisk_id, None) ) - return inventory + for line in info: + if len(line) in (11, 12): + yield line[0], None def check_ibm_svc_array(item, _no_params, info): - status = 3 - for mdisk_id, mdisk_name, mdisk_status, mdisk_grp_id, mdisk_grp_name, capacity, \ - raid_status, raid_level, redundancy, strip_size, tier in info: - if mdisk_id == item: + for line in info: + if len(line) in (11, 12) and line[0] == item: + raid_status = line[6] + raid_level = line[7] + tier = line[10] # Check raid_status - message = "RAID Array %s reports status %s" % (item, raid_status) + message = "Status: %s" % raid_status if raid_status == "online": status = 0 - elif raid_status == "offline" or raid_status == "degraded": + elif raid_status in ("offline", "degraded"): status = 2 message += "(!!)" else: @@ -60,12 +59,9 @@ def check_ibm_svc_array(item, _no_params, info): message += ", RAID Level: %s, Tier: %s" % (raid_level, tier) return status, message - return 3, "RAID Array %s not found in agent output" % item check_info["ibm_svc_array"] = { "check_function" : check_ibm_svc_array, "inventory_function" : inventory_ibm_svc_array, "service_description" : "RAID Array %s", - "has_perfdata" : False, } - diff --git a/checks/ibm_svc_mdisk b/checks/ibm_svc_mdisk index f1adb0a..10a9419 100644 --- a/checks/ibm_svc_mdisk +++ b/checks/ibm_svc_mdisk @@ -39,40 +39,36 @@ def inventory_ibm_svc_mdisk(info): - inventory = [] - for mdisk_id, mdisk_name, mdisk_status, mdisk_mode, mdisk_grp_id, mdisk_grp_name, capacity, ctrl_lun_number, controller_name, mdisk_uid, tier in info: - inventory.append( (mdisk_name, None) ) - return inventory + for line in info: + if len(line) in (11, 12): + yield line[1], None def check_ibm_svc_mdisk(item, _no_params, info): - status = 3 - for mdisk_id, mdisk_name, mdisk_status, mdisk_mode, mdisk_grp_id, mdisk_grp_name, capacity, ctrl_lun_number, controller_name, mdisk_uid, tier in info: - if mdisk_name == item: + for line in info: + if len(line) in (11, 12) and line[1] == item: + mdisk_status = line[2] + mdisk_mode = line[3] - # Check mdisk_status - message = "%s reports status %s" % (item, mdisk_status) + message = "Status: %s" % mdisk_status if mdisk_status == "online": status = 0 - elif mdisk_status == "offline" or mdisk_status == "excluded": + elif mdisk_status in ("offline", "excluded"): status = 2 message += "(!!)" else: status = 1 message += "(!)" - # check mdisk_mode - message += ", Mode %s" % mdisk_mode + message += ", Mode: %s" % mdisk_mode if mdisk_mode not in ( "managed", "array" ): status = max(status, 1) message += "(!)" return status, message - return 3, "MDisk %s not found in agent output" % item check_info["ibm_svc_mdisk"] = { "check_function" : check_ibm_svc_mdisk, "inventory_function" : inventory_ibm_svc_mdisk, "service_description" : "MDisk %s", - "has_perfdata" : False, } diff --git a/checks/ibm_svc_mdiskgrp b/checks/ibm_svc_mdiskgrp index 67c8c30..828f4ae 100644 --- a/checks/ibm_svc_mdiskgrp +++ b/checks/ibm_svc_mdiskgrp @@ -56,33 +56,28 @@ def ibm_svc_mdiskgrp_to_mb(size): return size def inventory_ibm_svc_mdiskgrp(info): - inventory = [] - for mgrp_id, mgrp_name, mgrp_status, mdisk_count, vdisk_count, capacity, \ - extent_size, free_capacity, virtual_capacity, used_capacity, \ - real_capacity, overallocation, mgrp_warning, easy_tier, easy_tier_status, \ - compression_active, compression_virtual_capacity, compression_compressed_capacity, \ - compression_uncompressed_capacity in info: - inventory.append( (mgrp_name, {}) ) - return inventory + for line in info: + if len(line) in (15, 19, 24): + yield line[1], {} def check_ibm_svc_mdiskgrp(item, params, info): - for mgrp_id, mgrp_name, mgrp_status, mdisk_count, vdisk_count, capacity, \ - extent_size, free_capacity, virtual_capacity, used_capacity, \ - real_capacity, overallocation, mgrp_warning, easy_tier, easy_tier_status, \ - compression_active, compression_virtual_capacity, compression_compressed_capacity, \ - compression_uncompressed_capacity in info: - if mgrp_name == item: - if mgrp_status != "online": - return 2, "MDiskGrp %s reports status %s" % (item, mgrp_status) - fslist = [] - size_mb = ibm_svc_mdiskgrp_to_mb(capacity) - avail_mb = ibm_svc_mdiskgrp_to_mb(free_capacity) - fslist.append((item, size_mb, avail_mb)) - status, message, perfdata = df_check_filesystem_list(item, params, fslist) - message += ", MDiskGrp %s reports status %s" % (item, mgrp_status) - return status, message, perfdata + for line in info: + if len(line) in (15, 19, 24) and item == line[1]: + mgrp_status = line[2] - return 3, "MDiskGrp %s not found in agent output" % item + if mgrp_status != "online": + return 2, "Status: %s" % mgrp_status + + fslist = [] + capacity = line[5] + free_capacity = line[7] + size_mb = ibm_svc_mdiskgrp_to_mb(capacity) + avail_mb = ibm_svc_mdiskgrp_to_mb(free_capacity) + fslist.append((item, size_mb, avail_mb)) + status, message, perfdata = df_check_filesystem_list(item, params, fslist) + message += ", Status: %s" % mgrp_status + + return status, message, perfdata check_info["ibm_svc_mdiskgrp"] = { diff --git a/checks/ibm_svc_portfc b/checks/ibm_svc_portfc index b2d171c..bcae05f 100644 --- a/checks/ibm_svc_portfc +++ b/checks/ibm_svc_portfc @@ -52,29 +52,26 @@ def inventory_ibm_svc_portfc(info): - inventory = [] for line in info: - if len(line) in (11, 12) and line[9] == "active": - inventory.append( (line[0], None) ) - return inventory + if len(line) in (11, 12, 14) and line[9] == "active": + yield line[0], None def check_ibm_svc_portfc(item, _no_params, info): for line in info: - if len(line) in (11, 12): - fc_port_id = line[0] - fc_port_status = line[9] - if fc_port_id == item: + if len(line) in (11, 12, 14): + if line[0] == item: + fc_port_status = line[9] + if fc_port_status == "active": - return 0, "FC Port %s is %s" % (fc_port_id, fc_port_status) + state = 0 else: - return 2, "FC Port %s is %s" % (fc_port_id, fc_port_status) + state = 2 - return 3, "FC Port %s not found in agent output" % item + return state, fc_port_status check_info["ibm_svc_portfc"] = { "check_function" : check_ibm_svc_portfc, "inventory_function" : inventory_ibm_svc_portfc, "service_description" : "FC Port %s", - "has_perfdata" : False, }

9 years, 8 months

Check_MK Git: check_mk: #1526 climaveneta_fan: No longer outputs performance data, now configured via "fan" rule

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8eab2131a78862424f7781baaddef59955b011cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eab2131a78862… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 21 15:39:12 2015 +0100 #1526 climaveneta_fan: No longer outputs performance data, now configured via "fan" rule This check is now configured via a different WATO rule, so any old rules set will no longer apply. Re-inventory required. --- .werks/1526 | 10 +++++++++ ChangeLog | 2 ++ checkman/climaveneta_fan | 8 +++---- checks/climaveneta_fan | 23 +++++--------------- checks/fan.include | 38 ++++++++++++++++++++++++++++++++++ checks/temperature.include | 3 +-- web/plugins/wato/check_parameters.py | 24 +++++++++++++++++++++ 7 files changed, 83 insertions(+), 25 deletions(-) diff --git a/.werks/1526 b/.werks/1526 new file mode 100644 index 0000000..24e01c2 --- /dev/null +++ b/.werks/1526 @@ -0,0 +1,10 @@ +Title: climaveneta_fan: No longer outputs performance data, now configured via "fan" rule +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1421850987 +Class: feature + +This check is now configured via a different WATO rule, so any old rules set will +no longer apply. Re-inventory required. diff --git a/ChangeLog b/ChangeLog index 024d3ac..2ca18de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,8 @@ NOTE: Please refer to the migration notes! * 1525 viprinet_temp: Now uses new Temperature WATO rule... NOTE: Please refer to the migration notes! + * 1526 climaveneta_fan: No longer outputs performance data, now configured via "fan" rule... + NOTE: Please refer to the migration notes! * 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/climaveneta_fan b/checkman/climaveneta_fan index 31978da..ff64db7 100644 --- a/checkman/climaveneta_fan +++ b/checkman/climaveneta_fan @@ -10,13 +10,11 @@ item: The id of the fan (1 or 2) perfdata: - the current fan speed in RPM + None inventory: For each fan one service is created [parameters] -lower_warning (int): Warning if speed is beneath -lower_critical (int): Minimum level for the speed -upper_warning (int): Warning if the speed is above -upper_critical (int): Maximum level for the speed +warn (int): Warning if speed is below +crit (int): Critical if speed is below diff --git a/checks/climaveneta_fan b/checks/climaveneta_fan index 63d6672..09d135a 100644 --- a/checks/climaveneta_fan +++ b/checks/climaveneta_fan @@ -25,39 +25,26 @@ # Boston, MA 02110-1301 USA. -factory_settings["climaveneta_fan_default_levels"] = { - "lower" : ( 200, 100 ), - "upper" : ( 700, 800 ), -} +climaveneta_fan_default_levels = (200, 100) def inventory_climaveneta_fan(info): if len(info[0]) == 2: - return [ (1, {}), (2, {}) ] + return [ (1, climaveneta_fan_default_levels), (2, climaveneta_fan_default_levels) ] def check_climaveneta_fan(item, params, info): rpm = int(info[0][item - 1]) - l_warn, l_crit = params['lower'] - u_warn, u_crit = params['upper'] - perfdata = [("rpm", rpm )] - message = "Speed at %d RPM" % rpm - if rpm <= l_crit or rpm >= u_crit: - return 2, message, perfdata - elif rpm <= l_warn or rpm >= u_warn: - return 1, message, perfdata - else: - return 0, message, perfdata + return check_fan(rpm, params) check_info["climaveneta_fan"] = { "check_function" : check_climaveneta_fan, "inventory_function" : inventory_climaveneta_fan, "service_description" : "Fan %s", - "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "pCO Gateway", "snmp_info" : (".1.3.6.1.4.1.9839.2.1.2", [ 42, 43 ] ), - "group" : "hw_fans", - "default_levels_variable" : "climaveneta_fan_default_levels", + "group" : "fan", + "includes" : [ "fan.include" ], } diff --git a/checks/fan.include b/checks/fan.include new file mode 100644 index 0000000..6acb00d --- /dev/null +++ b/checks/fan.include @@ -0,0 +1,38 @@ +#!/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 check_fan(rpm, params): + warn, crit = params + message = "Speed at %d rpm" % rpm + levelstext = " (warn/crit at %s/%s rpm)" % params + if rpm < crit: + message += levelstext + return 2, message + elif rpm < warn: + message += levelstext + return 1, message + else: + return 0, message diff --git a/checks/temperature.include b/checks/temperature.include index 7b41d69..beeadc4 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -41,7 +41,6 @@ def celsius_to_fahrenheit(tempc): # dev_level_lower: lower warn/crit device levels # dev_status: temperature state (0, 1, 2) as the device reports it (if applies) # Note: you must not specify dev_status and dev_levels at the same time! -# def check_temperature(reading, params, dev_unit = "c", dev_levels = None, dev_levels_lower = None, dev_status = None): @@ -209,7 +208,7 @@ def check_temperature(reading, params, dev_unit = "c", # Render actual temperature, e.g. "17.8 °F" infotext = "%s %s" % (render_temp(temp), unitsym[output_unit]) - # In case of a non-OK status ouput the information about the levels + # In case of a non-OK status output the information about the levels if status != 0: usr_levelstext = "" usr_levelstext_lower = "" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8ae9352..21dc4f3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5608,6 +5608,30 @@ register_check_parameters( ) register_check_parameters( + subgroup_environment, + "fan", + _("Fan speed"), + Tuple( + elements = [ + Integer( + title = _("Warning below"), + default_value = 200, + unit = u"rpm", + ), + Integer( + title = _("Critical below"), + default_value = 100, + unit = u"rpm", + ), + ] + ), + TextAscii( + title = _("Fan Name"), + help = _("The identificator of the fan.")), + None +) + +register_check_parameters( subgroup_os, "pf_used_states", _("Number of used states of OpenBSD PF engine"),

9 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015