Module: check_mk
Branch: master
Commit: 443e3e5de300a8f3d14cf43310231f19751cb491
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=443e3e5de300a8…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Fri Dec 5 15:22:18 2014 +0100
#1454 FIX megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected
by the linux agent
---
.werks/1454 | 9 +++++++++
ChangeLog | 1 +
agents/check_mk_agent.linux | 2 ++
3 files changed, 12 insertions(+)
diff --git a/.werks/1454 b/.werks/1454
new file mode 100644
index 0000000..6e83e40
--- /dev/null
+++ b/.werks/1454
@@ -0,0 +1,9 @@
+Title: megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected by
the linux agent
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i7
+Date: 1417789268
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 78f7ee5..359ab6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,6 +116,7 @@
* 1681 FIX: cmciii_lcp_fans: Skipping non FAN units now; cleaned up check
* 1682 FIX: cmciii_lcp_waterflow: Check can now deal with devices with a different
setup
* 1701 FIX: Correctly show absolute level for CPU load in case of warn/crit...
+ * 1454 FIX: megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also
detected by the linux agent
Multisite:
* 1508 Allow input of plugin output and perfdata when faking check results...
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index d381007..40d0b7e 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -355,6 +355,8 @@ if type MegaCli >/dev/null ; then
MegaCli_bin="MegaCli"
elif type MegaCli64 >/dev/null ; then
MegaCli_bin="MegaCli64"
+elif type megacli >/dev/null ; then
+ MegaCli_bin="megacli"
else
MegaCli_bin="unknown"
fi