Module: check_mk
Branch: master
Commit: 95b198a6e47c62f599831897a692be969d4d1828
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95b198a6e47c62…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Feb 11 11:57:12 2016 +0100
#3052 FIX domino_mailqueues: Fixed exception when receiving empty data from SNMP
---
.werks/3052 | 9 +++++++++
ChangeLog | 1 +
checks/domino_mailqueues | 5 ++++-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/3052 b/.werks/3052
new file mode 100644
index 0000000..d03191e
--- /dev/null
+++ b/.werks/3052
@@ -0,0 +1,9 @@
+Title: domino_mailqueues: Fixed exception when receiving empty data from SNMP
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i4
+Date: 1455188210
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 3daf38c..8d34471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -267,6 +267,7 @@
* 3172 FIX: fjdarye100_rluns fjdarye101_rluns fjdarye60_rluns: Correctly detect
RAID 0 state...
* 3174 FIX: Fix exception in Check_MK agent version check if version number does not
contain three parts
* 3049 FIX: esx_vsphere_hostsystem.mem_usage_cluster: Fixed exception when no
thresholds configured
+ * 3052 FIX: domino_mailqueues: Fixed exception when receiving empty data from SNMP
Multisite:
* 2684 Added icons for downloading agent data / walks of hosts...
diff --git a/checks/domino_mailqueues b/checks/domino_mailqueues
index b3e18bc..46f8a71 100644
--- a/checks/domino_mailqueues
+++ b/checks/domino_mailqueues
@@ -45,6 +45,9 @@ def inventory_domino_mailqueues(info):
def check_domino_mailqueues(item, params, info):
for line in info:
+ if not line:
+ continue
+
val = int(line[0][0].split(".")[12])
if item == domino_mailqueues[val][0]:
reading = int(line[0][1])
@@ -69,6 +72,6 @@ check_info["domino_mailqueues"] = {
"default_levels_variable" : "domino_mailqueues_defaults",
"snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
== ".1.3.6.1.4.1.311.1.1.3.1.2",
"snmp_info" : map(lambda x:
(".1.3.6.1.4.1.334.72.1.1.4", [OID_STRING, x]),
- domino_mailqueues.keys()),
+ sorted(domino_mailqueues.keys())),
"group" : "domino_mailqueues"
}