[checkmk-commits] Check_MK Git: check_mk: hp_proliant_*: improve scan function

Module: check_mk Branch: master Commit: c91e8fe78a597f87457480b11c1dd1ecc320dd5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c91e8fe78a597f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 14:05:50 2011 +0100 hp_proliant_*: improve scan function --- ChangeLog | 2 +- checks/hp_proliant_cpu | 2 +- checks/hp_proliant_da_phydrv | 2 +- checks/hp_proliant_fans | 2 +- checks/hp_proliant_mem | 2 +- checks/hp_proliant_psu | 2 +- checks/hp_proliant_temp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa92a64..5023ab0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,7 +28,7 @@ * Added Perf-O-Meter for non-df filesystem checks (e.g. netapp) * FIX: removed filesystem_trend_perfdata. It didn't work. Use now df-parameter "trend_perfdata" (see new man page of df) - + * hp_proliant_*: improve scan function (now just looks for "proliant") 1.1.9i9: Core, Setup, etc.: diff --git a/checks/hp_proliant_cpu b/checks/hp_proliant_cpu index 0daee95..501a334 100644 --- a/checks/hp_proliant_cpu +++ b/checks/hp_proliant_cpu @@ -53,4 +53,4 @@ snmp_info['hp_proliant_cpu'] = ( ".1.3.6.1.4.1.232.1.2.2.1.1", [ "1", # cpqSeCp ] ) snmp_scan_functions['hp_proliant_cpu'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower() diff --git a/checks/hp_proliant_da_phydrv b/checks/hp_proliant_da_phydrv index 0882603..accb6af 100644 --- a/checks/hp_proliant_da_phydrv +++ b/checks/hp_proliant_da_phydrv @@ -86,4 +86,4 @@ snmp_info['hp_proliant_da_phydrv'] = ( ".1.3.6.1.4.1.232.3.2.5.1.1", [ "1", # ] ) snmp_scan_functions['hp_proliant_da_phydrv'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower() diff --git a/checks/hp_proliant_fans b/checks/hp_proliant_fans index 19bec9b..735b9cd 100644 --- a/checks/hp_proliant_fans +++ b/checks/hp_proliant_fans @@ -91,4 +91,4 @@ snmp_info['hp_proliant_fans'] = ( ".1.3.6.1.4.1.232.6.2.6.7.1", [ "1", # cpqHe ] ) snmp_scan_functions['hp_proliant_fans'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower() diff --git a/checks/hp_proliant_mem b/checks/hp_proliant_mem index 91c19ca..62a4813 100644 --- a/checks/hp_proliant_mem +++ b/checks/hp_proliant_mem @@ -128,4 +128,4 @@ snmp_info['hp_proliant_mem'] = ( ".1.3.6.1.4.1.232.6.2.14.13.1", [ "2", # cpqH ] ) snmp_scan_functions['hp_proliant_mem'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower() diff --git a/checks/hp_proliant_psu b/checks/hp_proliant_psu index 922ac4f..ad49450 100644 --- a/checks/hp_proliant_psu +++ b/checks/hp_proliant_psu @@ -56,4 +56,4 @@ snmp_info['hp_proliant_psu'] = ( ".1.3.6.1.4.1.232.6.2.9.3.1", [ "1", # cpqHeFl ] ) snmp_scan_functions['hp_proliant_psu'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower() diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp index ec7e292..ed453b6 100644 --- a/checks/hp_proliant_temp +++ b/checks/hp_proliant_temp @@ -75,4 +75,4 @@ snmp_info['hp_proliant_temp'] = ( ".1.3.6.1.4.1.232.6.2.6.8.1", [ "1", # cpqHeT "6", # cpqHeTemperatureCondition ] ) snmp_scan_functions['hp_proliant_temp'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower()