Module: check_mk
Branch: master
Commit: 9b3af8ab8386f86ee6562010373b6d42b7032a12
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b3af8ab8386f8…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Jan 24 17:04:14 2011 +0100
fc_brocade_port*: improve SNMP scanning
---
ChangeLog | 2 ++
checks/fc_brocade_port | 2 ++
checks/fc_brocade_port_detailed | 3 ++-
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0f4e78c..bc906f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1.1.9i6:
Checks & Agents:
* megaraid_ldisks: remove debug output
+ * fc_brocade_port: hide on SNMP scan, prefer fc_brocade_port_detailed
+ * fc_brocade_port_detailed: improve scan function, find more devices
1.1.9i5:
diff --git a/checks/fc_brocade_port b/checks/fc_brocade_port
index 935d413..1ec63c1 100644
--- a/checks/fc_brocade_port
+++ b/checks/fc_brocade_port
@@ -84,6 +84,8 @@ def check_brocade_port(portno, params, info):
check_info['fc_brocade_port'] = (check_brocade_port, "PORT %s", 1,
inventory_brocade_port)
snmp_info['fc_brocade_port'] = ( "1.3.6.1.4.1.1588.2.1.1.1.6.2.1", [ 1,
3, 4, 11, 12, 22, 28 ] )
+snmp_scan_functions['fc_brocade_port'] = \
+ lambda oid: False # prefer fc_brodade_port_detailed
# 1: swFCPortIndex, 3: swFCPortOpStatus, 4:swFCPortAdmStatus,
# 11: swFCPortTxWords, 12: swFCPortRxWords
# 22: swFCPortRxCrcs, 28: swFCPortC3Discards
diff --git a/checks/fc_brocade_port_detailed b/checks/fc_brocade_port_detailed
index 0d65e1a..5d205f8 100644
--- a/checks/fc_brocade_port_detailed
+++ b/checks/fc_brocade_port_detailed
@@ -223,4 +223,5 @@ snmp_info['fc_brocade_port_detailed'] = [
]
snmp_scan_functions['fc_brocade_port_detailed'] = \
- lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [
".1.3.6.1.4.1.1588.2.1.1.1", ".1.3.6.1.4.1.1588.2.1.1.44" ]
+ lambda oid:
oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1.")
+