[checkmk-commits] Check_MK Git: check_mk: megaraid_pdisks: Better handling of MegaCli output (Thanks to Bastian Kuhn)

Module: check_mk Branch: master Commit: 62b0f9dce9badca9114844ce2a218aac17d6b53b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62b0f9dce9badc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 5 10:05:15 2011 +0200 megaraid_pdisks: Better handling of MegaCli output (Thanks to Bastian Kuhn) --- ChangeLog | 1 + checks/megaraid_pdisks | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 730b4e4..fa4f3ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ the running state, number of sessions and number of requests now. Can be extended via agent configuration (j4p.cfg). * Added some preflight checks to --scan-parents code + * megaraid_pdisks: Better handling of MegaCli output (Thanks to Bastian Kuhn) Multisite: * FIX: make non-Ascii characters in services names work again diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index 9ac8dd0..601b853 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -53,7 +53,7 @@ def inventory_megaraid_pdisks(checkname, info): for line in info: if line[0] == "dev2enc": dev2enc[line[5]] = 'e'+line[2] - elif line[0] == "Enclosure": + elif line[0] == "Enclosure" and line[1] == "Device": enclosure = dev2enc.get(line[-1], line[-1]) elif line[0] == "Slot": slot = int(line[-1]) @@ -69,7 +69,7 @@ def check_megaraid_pdisks(item, target_state, info): for line in info: if line[0] == "dev2enc": dev2enc[line[5]] = 'e'+line[2] - elif line[0] == "Enclosure": + elif line[0] == "Enclosure" and line[1] == "Device": if item.startswith('e') and line[-1] in dev2enc: enclosure = dev2enc[line[-1]] else: