[checkmk-commits] alcatel_power: refactor

Module: check_mk Branch: master Commit: adff40229fd5975994c88edb91a72274884b77ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adff40229fd597… Author: Florian Kromer &lt;fk(a)mathias-kettner.de&gt; Date: Mon Dec 17 11:00:32 2018 +0100 alcatel_power: refactor CMK-1188 Change-Id: Ib22d41a41d04f5c16ce5d3dc70486ab1335b2c80 --- checks/alcatel.include | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ checks/alcatel_power | 35 ++++++-------------------------- 2 files changed, 60 insertions(+), 29 deletions(-) diff --git a/checks/alcatel.include b/checks/alcatel.include new file mode 100644 index 0000000..d000cda --- /dev/null +++ b/checks/alcatel.include @@ -0,0 +1,54 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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 alcatel_networking_products_scan_function(oid): + sys_object_id = ".1.3.6.1.2.1.1.2.0" # MIB object "sysObjectID" + alcatel_ind_1_base_mib = ".1.3.6.1.4.1.6486.800" # MIB object "alcatelIND1BaseMIB" + return oid(sys_object_id).startswith(alcatel_ind_1_base_mib) + + +def inventory_alcatel_power(info): + for line in info: + oid_end, _, device_type, power_type = line + if (power_type and power_type != '0' or device_type in [ + '0x35000001', '0x45000002', '0x45000004', '0x45000008', '0x45000009' + ]): + yield oid_end, None + + +def check_alcatel_power(item, _no_params, info): + for line in info: + oid_end, status, device_type, power_type = line + if item == oid_end: + if (power_type and power_type == '0' or device_type not in [ + '0x35000001', '0x45000004', '0x45000002', '0x45000008', '0x45000009' + ]): + return 3, "No Power supply connected to this port" + if status != '1': + return 2, "Supply in error condition (%s)" % status + return 0, "Supply status OK" + return 3, "Supply not found" diff --git a/checks/alcatel_power b/checks/alcatel_power index f25d6ea..e5c2ac2 100644 --- a/checks/alcatel_power +++ b/checks/alcatel_power @@ -24,41 +24,18 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - -def inventory_alcatel_power(info): - for line in info: - oid_end, _, device_type, power_type = line - if (power_type and power_type != '0' or device_type in [ - '0x35000001', '0x45000002', '0x45000004', '0x45000008', '0x45000009' - ]): - yield oid_end, None - - -def check_alcatel_power(item, _no_params, info): - for line in info: - oid_end, status, device_type, power_type = line - if item == oid_end: - if (power_type and power_type == '0' or device_type not in [ - '0x35000001', '0x45000004', '0x45000002', '0x45000008', '0x45000009' - ]): - return 3, "No Power supply connected to this port" - if status != '1': - return 2, "Supply in error condition (%s)" % status - return 0, "Supply status OK" - return 3, "Supply not found" - - check_info["alcatel_power"] = { "check_function": check_alcatel_power, "inventory_function": inventory_alcatel_power, "service_description": "Power Supply %s", - "snmp_scan_function": lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.6486.800"), + "snmp_scan_function": alcatel_networking_products_scan_function, "snmp_info": ( - ".1.3.6.1.4.1.6486.800.1.1.1.1.1.1.1", + ".1.3.6.1.4.1.6486.800.1.1.1.1.1.1.1", # MIB object "chasEntPhysicalEntry" [ OID_END, - 2, # Error Status - 5, # Device Type (0x35000001 == Power Supply) - 36, # chasEntPhysPowerType: 0 no power supply, 1 ac, 2 dc (not available on old devices) + 2, # MIB object "chasEntPhysOperStatus": up(1), down(2), testing(3), unknown(4), secondary(5), notPresent(6), unpowered(7), master(9) + 5, # MIB object "chasEntPhysModuleType": Device Type (0x35000001 == Power Supply) + 36, # MIB object "chasEntPhysPowerType": 0 no power supply, 1 ac, 2 dc (not available on old devices) ]), + "includes": ["alcatel.include"], }