Module: check_mk
Branch: master
Commit: 20e084bc9c5f9083b7f8029fd3f31f50291678cb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20e084bc9c5f90…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Jul 19 09:42:49 2012 +0200
FIX: megaraid_pdisks: handle case where no enclosure device exists
---
ChangeLog | 1 +
checks/megaraid_pdisks | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9208421..13742d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
Checks & Agents:
* mssql_backup: Fixed problems with datetime/timezone calculations
* New Checks for Siemens Blades (BX600)
+ * FIX: megaraid_pdisks: handle case where no enclosure device exists
WATO:
* FIX: remove line about number of rules in rule set overview
diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks
index 6ce5d3d..53abb49 100644
--- a/checks/megaraid_pdisks
+++ b/checks/megaraid_pdisks
@@ -54,6 +54,7 @@ def megaraid_pdisks_parse(info):
current_adapter = adapters[0]
return_var = []
adapter = 0
+ enclosure_devid = 0
for line in info:
if line[0] == 'adapter':
current_adapter = {}
@@ -65,7 +66,12 @@ def megaraid_pdisks_parse(info):
current_adapter = adapters[int(line[1][1:])] # Raute weglassen
adapter = int(line[1][1:])
elif line[0] == "Enclosure" and line[1] == "Device":
- enclosure_devid = int(line[-1])
+ try:
+ enclosure_devid = int(line[-1])
+ except: # no enclosure device
+ enclosure_devid = 0
+ adapters[adapter][0] = 0
+
elif line[0] == "Slot":
slot = int(line[-1])
elif line[0] == "Firmware" and line[1] == "state:":