Module: check_mk
Branch: master
Commit: d1b71f2dbebaf66d261736835988bef2e9b2e7f1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1b71f2dbebaf6…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Sep 20 12:15:26 2012 +0200
Extended snmp scan function of hp_prolaint
---
checks/hp_proliant | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/checks/hp_proliant b/checks/hp_proliant
index 241d2df..9e7b7ea 100644
--- a/checks/hp_proliant
+++ b/checks/hp_proliant
@@ -39,8 +39,8 @@ def inventory_proliant_general(info):
return [ (None, None) ]
def check_proliant_general(item, no_params, info):
- snmp_state = hp_proliant_status_map[int(info[0][0])]
- status = hp_proliant_status2nagios_map[snmp_state]
+ snmp_state = hp_proliant_generel_status_map[int(info[0][0])]
+ status = hp_proliant_generel_status2nagios_map[snmp_state]
return (status, "%s - General Status is %s (Firmware: %s, S/N: %s)" %
(nagios_state_names[status], snmp_state, info[0][1],
info[0][2]))
@@ -48,4 +48,5 @@ def check_proliant_general(item, no_params, info):
check_info['hp_proliant'] = (check_proliant_general, "General Status",
0, inventory_proliant_general)
snmp_info['hp_proliant'] = ( ".1.3.6.1.4.1.232", [
"11.1.3.0", "11.2.14.1.1.5.0", "2.2.2.1.0" ] )
snmp_scan_functions['hp_proliant'] = \
- lambda oid: "8072.3.2.10" in oid(".1.3.6.1.2.1.1.2.0")
+ lambda oid: "8072.3.2.10" in oid(".1.3.6.1.2.1.1.2.0") or \
+ (".1.3.6.1.4.1.311.1.1.3.1.2" in oid(".1.3.6.1.2.1.1.2.0") and
oid(".1.3.6.1.4.1.232.11.1.3.0"))