Module: check_mk
Branch: master
Commit: 0f781c9db7ef831c31bcd2f2483945aa31ca00e9
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f781c9db7ef83…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Dec 16 10:55:12 2011 +0100
FIX: netapp_*: scan functions now detect IBM versions of firmware
---
ChangeLog | 1 +
checks/netapp_cluster | 3 ++-
checks/netapp_vfiler | 3 ++-
checks/netapp_volumes | 3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dc9e769..75134f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,7 @@
not working but interface has been used since last reboot. This
fixes the problem where interface are not found by inventory.
* FIX: snmp_uptime: handels alternative timeformat
+ * FIX: netapp_*: scan functions now detect IBM versions of firmware
1.1.12p4:
Multisite:
diff --git a/checks/netapp_cluster b/checks/netapp_cluster
index 6accb22..e723647 100644
--- a/checks/netapp_cluster
+++ b/checks/netapp_cluster
@@ -109,4 +109,5 @@ check_info["netapp_cluster"] = (check_netapp_cluster,
"metrocluster_w_%s", 0, in
# Run inventory only on Data Ontap OS with cluster enabled
snmp_scan_functions["netapp_cluster"] = \
- lambda oid: "netapp release" in
oid(".1.3.6.1.2.1.1.1.0").lower()
+ lambda oid: "netapp release" in oid(".1.3.6.1.2.1.1.1.0").lower()
or \
+
oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.789")
diff --git a/checks/netapp_vfiler b/checks/netapp_vfiler
index 1b44ec4..3c6809d 100644
--- a/checks/netapp_vfiler
+++ b/checks/netapp_vfiler
@@ -68,4 +68,5 @@ check_info["netapp_vfiler"] = (check_netapp_vfiler,
"vFiler Status %s", 0, inven
snmp_scan_functions["netapp_vfiler"] = \
- lambda oid: "netapp release" in
oid(".1.3.6.1.2.1.1.1.0").lower()
+ lambda oid: "netapp release" in oid(".1.3.6.1.2.1.1.1.0").lower()
or \
+
oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.789")
diff --git a/checks/netapp_volumes b/checks/netapp_volumes
index a7ff567..05394c5 100644
--- a/checks/netapp_volumes
+++ b/checks/netapp_volumes
@@ -125,4 +125,5 @@ 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')
or \
+
oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.789")