[checkmk-commits] fixed some invalid check parameters

Module: check_mk Branch: master Commit: 2096d97915d35e66a627effdd4e2f8e0dd4449af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2096d97915d35e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 1 12:31:45 2017 +0100 fixed some invalid check parameters Change-Id: I9f5684ded4d7a4d07b24962e08d927fd5ef54b27 --- checks/enterasys_cpu_util | 26 +++++++++++++++----------- checks/enterasys_powersupply | 11 +++++++---- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/checks/enterasys_cpu_util b/checks/enterasys_cpu_util index cc06162..4f39817 100644 --- a/checks/enterasys_cpu_util +++ b/checks/enterasys_cpu_util @@ -24,7 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -enterasys_cpu_default_levels = (90, 95) + +factory_settings["enterasys_cpu_default_levels"] = { + "levels" : (90.0, 95.0), +} + def inventory_enterasys_cpu_util(info): # [:-2] to remove the oid end @@ -38,15 +42,15 @@ def check_enterasys_cpu_util(item, params, info): check_info["enterasys_cpu_util"] = { - "check_function" : check_enterasys_cpu_util, - "inventory_function" : inventory_enterasys_cpu_util, - "service_description" : "CPU util %s", - "snmp_info" : ( ".1.3.6.1.4.1.5624.1.2.49.1.1.1.1", [ OID_END, 3 ]), #util in last 1min - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") \ - or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), - "has_perfdata" : True, - "group" : "cpu_utilization_multiitem", - "includes" : [ "cpu_util.include" ], - + "check_function" : check_enterasys_cpu_util, + "inventory_function" : inventory_enterasys_cpu_util, + "service_description" : "CPU util %s", + "snmp_info" : ( ".1.3.6.1.4.1.5624.1.2.49.1.1.1.1", [ OID_END, 3 ]), #util in last 1min + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), + "has_perfdata" : True, + "group" : "cpu_utilization_multiitem", + "includes" : [ "cpu_util.include" ], + "default_levels_variable" : "enterasys_cpu_default_levels", } diff --git a/checks/enterasys_powersupply b/checks/enterasys_powersupply index f1434b6..c05e2f2 100644 --- a/checks/enterasys_powersupply +++ b/checks/enterasys_powersupply @@ -24,23 +24,27 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + # MIB structure: # 1.3.6.1.4.1.52.4.3.1.2.1.1.1 ctChasPowerSupplyNum # 1.3.6.1.4.1.52.4.3.1.2.1.1.2 ctChasPowerSupplyState # 1.3.6.1.4.1.52.4.3.1.2.1.1.3 ctChasPowerSupplyType # 1.3.6.1.4.1.52.4.3.1.2.1.1.4 ctChasPowerSupplyRedundancy + factory_settings['enterasys_powersupply_default'] = { - "redundancy_ok_states" : ( 1, ), + "redundancy_ok_states" : [ 1, ], } + def inventory_enterasys_powersupply(info): inventory = [] for num, state, typ, redun in info: if state == '3': - inventory.append(( num, None )) + inventory.append(( num, {} )) return inventory + def check_enterasys_powersupply(item, params, info): supply_types = { 1 : 'ac-dc', @@ -56,7 +60,7 @@ def check_enterasys_powersupply(item, params, info): for num, state, typ, redun in info: if num == item: - state,redun,typ = map(int, (state, redun, typ)) + state, redun, typ = map(int, (state, redun, typ)) if state == 4: return 2, 'PSU installed and not operating' if redun not in params['redundancy_ok_states']: @@ -74,4 +78,3 @@ check_info["enterasys_powersupply"] = { or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), "group" : "enterasys_powersupply", } -