Module: check_mk Branch: master Commit: bdf1dd4ddf767b0490e3b08596b5ecdb9f2eb4ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdf1dd4ddf767b… Author: Bastian Kuhn &lt;bk(a)mathias-kettner.de&gt; Date: Mon Mar 23 13:29:19 2015 +0100 #1238 FIX check_mk_agent.linux: Do not execute the multipath section if no /etc/multipath.conf exsist. --- .werks/1238 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1238 b/.werks/1238 new file mode 100644 index 0000000..2f6c5eb --- /dev/null +++ b/.werks/1238 @@ -0,0 +1,10 @@ +Title: check_mk_agent.linux: Do not execute the multipath section if no /etc/multipath.conf exsist. +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427113707 + + diff --git a/ChangeLog b/ChangeLog index 3615a9d..da02b7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -274,6 +274,7 @@ * 1236 FIX: multipath: Now show correct error in case of removed multipaths instead of check crash * 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. Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 2903421..d6c406c 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -250,8 +250,10 @@ cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for # Linux Multipathing if type multipath >/dev/null ; then - echo '<<<multipath>>>' - multipath -l + if [ -f /etc/multipath.conf ] ; then + echo '<<<multipath>>>' + multipath -l + fi fi # Performancecounter Platten