[checkmk-commits] Check_MK Git: check_mk: #1240 FIX multipath: improved detection for not installed multipath

Module: check_mk Branch: master Commit: 6c11df4316e39bc9bc879bfb7bc12282de1606e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c11df4316e39b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 14:34:12 2015 +0100 #1240 FIX multipath: improved detection for not installed multipath --- .werks/1240 | 10 ++++++++++ ChangeLog | 1 + checks/multipath | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1240 b/.werks/1240 new file mode 100644 index 0000000..2f8c485 --- /dev/null +++ b/.werks/1240 @@ -0,0 +1,10 @@ +Title: multipath: improved detection for not installed multipath +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427117606 + + diff --git a/ChangeLog b/ChangeLog index 13a9a65..1950181 100644 --- a/ChangeLog +++ b/ChangeLog @@ -275,6 +275,7 @@ * 2152 FIX: apache_status: Fixed plugin to work on CentOS/RedHat 5.x... * 1896 FIX: ups_socomec_capacity: Now no longer critical when device reports -1 minutes left on battery... * 1238 FIX: check_mk_agent.linux: Do not execute the multipath section if no /etc/multipath.conf exsist. + * 1240 FIX: multipath: improved detection for not installed multipath Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/multipath b/checks/multipath index 64dda25..d4ad6aa 100644 --- a/checks/multipath +++ b/checks/multipath @@ -176,6 +176,7 @@ def parse_multipath(info): group = {} numpaths = None for line in info: + # Ignore error messages due to invalid multipath.conf if line[0] == "multipath.conf": continue @@ -191,7 +192,7 @@ def parse_multipath(info): l = " ".join(line) # Skip output when multipath is not present - if l.endswith('DM multipath kernel driver not loaded') \ + if l.endswith('kernel driver not loaded') \ or l.endswith('does not exist, blacklisting all devices.') \ or l.endswith('A sample multipath.conf file is located at') \ or l.endswith('multipath.conf'):