[checkmk-commits] Check_MK Git: check_mk: Revert "Linux agent: Allow for another variety of multipath device naming"

Module: check_mk Branch: master Commit: 7f4fb0ba014e5eb380b6a0eaf8b1445d2907b6da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f4fb0ba014e5e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 16:57:03 2012 +0200 Revert "Linux agent: Allow for another variety of multipath device naming" This reverts commit ccec2b6a4fd023dceb7932e708fa1245d97ee02e. --- checks/multipath | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/checks/multipath b/checks/multipath index f9006aa..2eb1a40 100644 --- a/checks/multipath +++ b/checks/multipath @@ -120,15 +120,6 @@ # \_ 4:0:1:11 sdcf 69:48 [active][undef] # \_ 3:0:0:11 sdl 8:176 [active][undef] -# Just an underscore and a dash in the LUN name -# SDataCoreSANsymphony_DAT05-fscl dm-6 DataCore,SANsymphony -# [size=600G][features=0][hwhandler=0] -# \_ round-robin 0 [prio=-1][enabled] -# \_ 3:0:0:11 sdae 65:224 [active][undef] -# \_ round-robin 0 [prio=-1][enabled] -# \_ 4:0:0:11 sdt 65:48 [active][undef] - - def parse_multipath_output(info, only_uuid = None): # only_uuid --> look only for data of this uuid or alias @@ -145,7 +136,7 @@ def parse_multipath_output(info, only_uuid = None): (get_regex(r"^[a-zA-Z0-9_]+$"), 0, None), # 3. (get_regex(r"^([0-9a-z]{33}|[0-9a-z]{49})\s?dm.+$"), 1, None), # 4. (get_regex(r"^[a-zA-Z0-9_]+dm-.+$"), 0, None), # 5. Remove this line in 1.2.0 - (get_regex(r"^([a-zA-Z0-9_-]+)\s?dm-.+$"), 1, None), # 6. and 7. + (get_regex(r"^([a-zA-Z0-9_]+)\s?dm-.+$"), 1, None), # 6. ] reg_prio = get_regex("[[ ]prio=") @@ -156,7 +147,6 @@ def parse_multipath_output(info, only_uuid = None): group = {} numpaths = None for line in info: - print line # newer agent also output the device mapper table. # ignore those lines for now. if line[0] == "dm":