Module: check_mk
Branch: master
Commit: 75b83c34b060a160b86f8a0bba21a92dfeebe58b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75b83c34b060a1…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Jun 7 10:47:45 2012 +0200
diskstat: handle output 'No Devices Found' - avoiding exception
---
ChangeLog | 4 ++++
checks/diskstat | 15 +++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bd259bc..698e216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1.2.0p1:
+ Checks & Agents:
+ * diskstat: handle output 'No Devices Found' - avoiding exception
+
1.2.0:
Setup:
* FIX: fix building of RPM packages (due to mk_mysql, mk_postgres)
diff --git a/checks/diskstat b/checks/diskstat
index e6ba75e..a0f1972 100644
--- a/checks/diskstat
+++ b/checks/diskstat
@@ -90,12 +90,15 @@ def diskstat_parse_info(info):
if phase == 'info':
info_plain.append(line)
elif phase == 'dmsetup_info':
- majmin = tuple(map(int, line[1].split(':')))
- if len(line) == 4:
- name = "LVM %s" % line[0]
- else:
- name = "DM %s" % line[0]
- nameinfo[majmin] = name
+ try:
+ majmin = tuple(map(int, line[1].split(':')))
+ if len(line) == 4:
+ name = "LVM %s" % line[0]
+ else:
+ name = "DM %s" % line[0]
+ nameinfo[majmin] = name
+ except:
+ pass # ignore such crap as "No Devices Found"
elif phase == 'vx_dsk':
maj = int(line[0], 16)
min = int(line[1], 16)