Module: check_mk Branch: master Commit: 5eed47a670da84b7bea45e2e63e9441120d9d13a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5eed47a670da84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 16:37:57 2011 +0100 FIX: netapp_volumes: The check handled 64-bit aggregates correctly FIX: netapp_volumes: Fixed snmp scan function FIX: blade_*: Fixed snmp scan function --- ChangeLog | 3 +++ checks/blade_bays | 2 +- checks/blade_blades | 2 +- checks/blade_blowers | 2 +- checks/blade_health | 2 +- checks/blade_mediatray | 2 +- checks/blade_powerfan | 2 +- checks/blade_powermod | 2 +- checks/netapp_volumes | 4 ++-- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68705fd..1f7d2b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,9 @@ * FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK) * FIX: repair PNP template for df when using trends * FIX: blade_health, fc_brocade_port_detailed removed debug outputs + * FIX: netapp_volumes: The check handled 64-bit aggregates correctly + * FIX: netapp_volumes: Fixed snmp scan function + * FIX: blade_*: Fixed snmp scan function Multisite: * FIX: fix json/python Webservice diff --git a/checks/blade_bays b/checks/blade_bays index 672f423..521d71c 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -55,4 +55,4 @@ check_info['blade_bays'] = (check_blade_bays, "BAY %s", 0, inventory_blade_bays snmp_info['blade_bays'] = ( "1.3.6.1.4.1.2.3.51.2.2.10.2.1.1", [ 5, 6 ] ) # BLADE-MIB snmp_scan_functions['blade_bays'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_blades b/checks/blade_blades index 1f7dcf0..9987737 100644 --- a/checks/blade_blades +++ b/checks/blade_blades @@ -74,4 +74,4 @@ snmp_info['blade_blades'] = ( "1.3.6.1.4.1.2.3.51.2.22.1.5.1.1", [ # BLADE-MIB ]) snmp_scan_functions['blade_blades'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_blowers b/checks/blade_blowers index 0060bb5..fc936e0 100644 --- a/checks/blade_blowers +++ b/checks/blade_blowers @@ -101,4 +101,4 @@ check_info['blade_blowers'] = ( check_blade_blowers, "Blower %s", 1, inventory_b snmp_info['blade_blowers'] = ( "1.3.6.1.4.1.2.3.51.2.2", [3] ) snmp_scan_functions['blade_blowers'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_health b/checks/blade_health index a7421a6..eec8a27 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -51,4 +51,4 @@ check_info['blade_health'] = ( check_blade_health, "Summary health state", 0, in snmp_info['blade_health'] = ( "1.3.6.1.4.1.2.3.51.2.2.7", [ '1', '2.1.3.1' ]) snmp_scan_functions['blade_health'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_mediatray b/checks/blade_mediatray index 4dfd806..4ee551a 100644 --- a/checks/blade_mediatray +++ b/checks/blade_mediatray @@ -46,4 +46,4 @@ check_info['blade_mediatray'] = ( check_blade_mediatray, "Media tray", 0, invent snmp_info['blade_mediatray'] = ( "1.3.6.1.4.1.2.3.51.2.2.5.2", [74, 75]) snmp_scan_functions['blade_mediatray'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_powerfan b/checks/blade_powerfan index 542d390..817b981 100644 --- a/checks/blade_powerfan +++ b/checks/blade_powerfan @@ -54,4 +54,4 @@ check_info['blade_powerfan'] = (check_blade_powerfan, "Power Module Cooling Devi snmp_info['blade_powerfan'] = ( "1.3.6.1.4.1.2.3.51.2.2.6.1.1", [ 1, 2, 3, 4, 5, 6, 7 ] ) # BLADE-MIB snmp_scan_functions['blade_powerfan'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_powermod b/checks/blade_powermod index f585035..674d1c2 100644 --- a/checks/blade_powermod +++ b/checks/blade_powermod @@ -45,4 +45,4 @@ check_info['blade_powermod'] = (check_blade_powermod, "Power Module %s", 0, inve snmp_info['blade_powermod'] = ( "1.3.6.1.4.1.2.3.51.2.2.4.1.1", [ 1, 2, 3, 4 ]) # BLADE-MIB snmp_scan_functions['blade_powermod'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/netapp_volumes b/checks/netapp_volumes index 7a365c1..a218f4e 100644 --- a/checks/netapp_volumes +++ b/checks/netapp_volumes @@ -95,7 +95,7 @@ def check_netapp_volumes(item, _not_used, info): if status == 'reconstructing': ret_state = 1 output += ' (WARN)' - elif status not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored' ]: + elif status.split(',')[0] not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored' ]: ret_state = 2 output += ' (CRIT)' @@ -110,4 +110,4 @@ snmp_info["netapp_volumes"] = ( ".1.3.6.1.4.1.789.1.5.8.1", ["2", # volName ] ) snmp_scan_functions['netapp_volumes'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0").startswith('"NetApp Release') + lambda oid: oid("1.3.6.1.2.1.1.1.0").startswith('NetApp Release')