[checkmk-commits] 4745 FIX multipath: Fixed crash on Dell devices if a colon is on uuid

Module: check_mk Branch: master Commit: 5dda2e4af0fc92be5dbcfea2996e03c402712908 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dda2e4af0fc92… Author: Marcel Arentz &lt;ma(a)mathias-kettner.de&gt; Date: Wed May 31 17:09:30 2017 +0200 4745 FIX multipath: Fixed crash on Dell devices if a colon is on uuid Change-Id: I735a7221615eede699cdfdefb0961e8dd5d92d0e --- .werks/4745 | 10 ++++++++++ checks/multipath | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4745 b/.werks/4745 new file mode 100644 index 0000000..ac2b9ca --- /dev/null +++ b/.werks/4745 @@ -0,0 +1,10 @@ +Title: multipath: Fixed crash on Dell devices if a colon is on uuid +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496243300 +Class: fix + + diff --git a/checks/multipath b/checks/multipath index 08119b2..9e68d0f 100644 --- a/checks/multipath +++ b/checks/multipath @@ -142,6 +142,12 @@ inventory_multipath_rules = [] # `-+- policy='round-robin 0' prio=0 status=enabled # `- 20:0:0:1 sdi 8:128 active undef running +# Here another one from Dell +# Dell_Internal_Dual_SD_0123456789AB-0:0 dm-2 Dell ,Internal Dual SD +# size=972M features='0' hwhandler='0' wp=rw +# `-+- policy='service-time 0' prio=0 status=active +# `- 1:0:0:0 sdb 8:16 active undef running + # And a completely new situation: # <<<multipath>>> # Nov 05 17:17:03 | DM multipath kernel driver not loaded @@ -166,7 +172,7 @@ def parse_multipath(info): (regex(r"^[a-zA-Z0-9_]+$"), 0, None, None), # 3. (regex(r"^([0-9a-z]{33}|[0-9a-z]{49})\s?(dm.[0-9]+).*$"), 1, None, 2), # 4. (regex(r"^[a-zA-Z0-9_]+(dm-[0-9]+).*$"), 0, None, 1), # 5. Remove this line in 1.2.0 - (regex(r"^([-a-zA-Z0-9_ ]+)\s?(dm-[0-9]+).*$"), 1, None, 2), # 6. and 7. + (regex(r"^([-a-zA-Z0-9_ :]+)\s?(dm-[0-9]+).*$"), 1, None, 2), # 6. and 7. ] reg_prio = regex("[[ ]prio=")