Module: check_mk
Branch: master
Commit: 7188ce3a7b77fe6ef1c1ac4ad136792cd65457ba
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7188ce3a7b77fe…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Mon May 30 11:22:20 2016 +0200
3626 FIX dell_eql_storage: fixed scan function if sysDescr is empty
---
.werks/3626 | 10 ++++++++++
ChangeLog | 1 +
checks/dell_eql_storage | 6 ++++--
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.werks/3626 b/.werks/3626
new file mode 100644
index 0000000..c465e39
--- /dev/null
+++ b/.werks/3626
@@ -0,0 +1,10 @@
+Title: dell_eql_storage: fixed scan function if sysDescr is empty
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1464599947
+
+
diff --git a/ChangeLog b/ChangeLog
index a8554b1..957c11e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -243,6 +243,7 @@
* 3578 FIX: df: Fixed exception when monitoring filesystems without inode infos
* 3624 FIX: oracle_asm_diskgroup: fixed dismounted disk handling
* 3625 FIX: zfs_arc_cache: fixed data handling if hits and misses are missing
+ * 3626 FIX: dell_eql_storage: fixed scan function if sysDescr is empty
Multisite:
* 3187 notification view: new filter for log command via regex
diff --git a/checks/dell_eql_storage b/checks/dell_eql_storage
index 931c8e3..d64cb46 100644
--- a/checks/dell_eql_storage
+++ b/checks/dell_eql_storage
@@ -24,10 +24,12 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
+
def inventory_dell_eql_storage(info):
for line in info:
yield line[0], {}
+
def check_dell_eql_storage(item, _no_params, info):
for name, desc, health_state, raid_state, total_storage, \
repl_storage, snap_storage, used_storage in info:
@@ -90,7 +92,8 @@ check_info["dell_eql_storage"] = {
"inventory_function" : inventory_dell_eql_storage,
"service_description" : "Storage %s",
"has_perfdata" : True,
- "snmp_scan_function" : lambda oid: "EQL-SUP" in
oid(".1.3.6.1.2.1.1.1.0"),
+ "snmp_scan_function" : lambda oid: "EQL-SUP" in
oid(".1.3.6.1.2.1.1.1.0") or \
+
oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12740.17"),
"snmp_info" : (".1.3.6.1.4.1.12740.2.1", [
"1.1.9.1", #eqlMemberName
"1.1.7.1", #eqlMemberDescription
@@ -102,4 +105,3 @@ check_info["dell_eql_storage"] = {
"10.1.2.1", #eqlMemberUsedStorage
]),
}
-