Module: check_mk
Branch: master
Commit: 87afe600ada511527fee274f333f5868746b310e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87afe600ada511…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Feb 20 09:14:52 2015 +0100
#2000 FIX check_mk_agent.freebsd: Add missing <<<local>>> section,
plugins was twice instead
Thanks to Aran Cox!
---
.werks/2000 | 10 ++++++++++
ChangeLog | 1 +
agents/check_mk_agent.freebsd | 7 ++++---
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/.werks/2000 b/.werks/2000
new file mode 100644
index 0000000..61a4576
--- /dev/null
+++ b/.werks/2000
@@ -0,0 +1,10 @@
+Title: check_mk_agent.freebsd: Add missing <<<local>>> section, plugins
was twice instead
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1424420058
+
+Thanks to Aran Cox!
diff --git a/ChangeLog b/ChangeLog
index 0332c5d..8962157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -168,6 +168,7 @@
* 1997 FIX: checkpoint_connections, checkpoint_packets: Detect more recent devices
* 1999 FIX: raritan_pdu_inlet_summary, raritan_pdu_inlet, ups_socomec_outphase:
renamed services to be consistent...
NOTE: Please refer to the migration notes!
+ * 2000 FIX: check_mk_agent.freebsd: Add missing <<<local>>>
section, plugins was twice instead...
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request,
added mailto link for error report...
diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd
index d39c600..00301ae 100755
--- a/agents/check_mk_agent.freebsd
+++ b/agents/check_mk_agent.freebsd
@@ -375,8 +375,9 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then
fi
-# Plugins
-if cd $PLUGINSDIR ; then
+# Local checks
+echo '<<<local>>>'
+if cd $LOCALDIR ; then
for skript in $(ls) ; do
if [ -f "$skript" -a -x "$skript" ] ; then
./$skript
@@ -385,7 +386,7 @@ if cd $PLUGINSDIR ; then
# Call some plugins only every X'th minute
for skript in [1-9]*/* ; do
if [ -x "$skript" ] ; then
- run_cached plugins_${skript//\//\\} ${skript%/*} "$skript"
+ run_cached local_${skript//\//\\} ${skript%/*} "$skript"
fi
done
fi