local paths standard conform
Message-ID: <55911377.+BztIKSdYHQN6oHF%lm(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.5 6/20/10
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: 480498a4b6b3a18c53bde18fdf47ac0ea8f3cc40
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=480498a4b6b3a1…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Jun 29 11:37:14 2015 +0200
#2351 FIX FreeBSD Agent: Made plugin/local paths standard conform
The former paths <tt>/usr/lib/check_mk_agent</tt> were not correct according
to FreeBSD standards. We have now switched the path to <tt>/usr/local/lib/check_mk_agent</tt>.
If you currently use the old paths, you will need to move this directory to
the new location when using the new agent.
---
.werks/2350 | 12 ++++++++++++
.werks/2351 | 12 ++++++++++++
ChangeLog | 4 ++++
3 files changed, 28 insertions(+)
diff --git a/.werks/2350 b/.werks/2350
new file mode 100644
index 0000000..0d085a2
--- /dev/null
+++ b/.werks/2350
@@ -0,0 +1,12 @@
+Title: FreeBSD Agent: Changed bash path to /usr/local/bin/bash
+Level: 2
+Component: checks
+Compatible: incomp
+Version: 1.2.7i3
+Date: 1435570316
+Class: fix
+
+Older versions of the FreeBSD Agent used the /bin/bash path as interpreter
+which seem not to be standard conform. It has now been changed to
+<tt>/usr/local/bin/bash</tt> in the hope that this is now correct and not
+breaking existing setups.
diff --git a/.werks/2351 b/.werks/2351
new file mode 100644
index 0000000..fcc24be
--- /dev/null
+++ b/.werks/2351
@@ -0,0 +1,12 @@
+Title: FreeBSD Agent: Made plugin/local paths standard conform
+Level: 2
+Component: checks
+Compatible: incomp
+Version: 1.2.7i3
+Date: 1435570513
+Class: fix
+
+The former paths <tt>/usr/lib/check_mk_agent</tt> were not correct according
+to FreeBSD standards. We have now switched the path to <tt>/usr/local/lib/check_mk_agent</tt>.
+If you currently use the old paths, you will need to move this directory to
+the new location when using the new agent.
diff --git a/ChangeLog b/ChangeLog
index 5552d05..e0030fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
* 1260 jolokia_metrics.perm_gen: New Check to monitor used Perm Space on a JVM
* 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset...
* 2316 FIX: windows agent: fix garbled output of cached agent plugins...
+ * 2350 FIX: FreeBSD Agent: Changed bash path to /usr/local/bin/bash...
+ NOTE: Please refer to the migration notes!
+ * 2351 FIX: FreeBSD Agent: Made plugin/local paths standard conform...
+ NOTE: Please refer to the migration notes!
Multisite:
* 2314 FIX: Availability: fixed exception when grouping by host or service group
Module: check_mk
Branch: master
Commit: 3231824ee9eebdc85e92daacdae79f4e1ddd11b9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3231824ee9eebd…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Jun 29 11:42:31 2015 +0200
#2352 FIX FreeBSD Agent: Removed statgrab cpu section because there is a dedicated cpu section
Removed the <tt>statgrab_cpu</tt> section from the agent because there is a standard
conform <tt>cpu</tt> section in the agent.
If yoy used the <tt>statgrab_cpu</tt> check before and have disabled the <tt>cpu</tt>
check on your devices by configuration, you will need to remove the "disabled services"
or "disabled checks" rules from your hosts.
---
.werks/2352 | 14 ++++++++++++++
ChangeLog | 1 +
agents/check_mk_agent.freebsd | 7 +++----
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/.werks/2352 b/.werks/2352
new file mode 100644
index 0000000..dcf52e0
--- /dev/null
+++ b/.werks/2352
@@ -0,0 +1,14 @@
+Title: FreeBSD Agent: Removed statgrab cpu section because there is a dedicated cpu section
+Level: 2
+Component: checks
+Compatible: compat
+Version: 1.2.7i3
+Date: 1435570636
+Class: fix
+
+Removed the <tt>statgrab_cpu</tt> section from the agent because there is a standard
+conform <tt>cpu</tt> section in the agent.
+
+If yoy used the <tt>statgrab_cpu</tt> check before and have disabled the <tt>cpu</tt>
+check on your devices by configuration, you will need to remove the "disabled services"
+or "disabled checks" rules from your hosts.
diff --git a/ChangeLog b/ChangeLog
index e0030fe..1fcf1a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
NOTE: Please refer to the migration notes!
* 2351 FIX: FreeBSD Agent: Made plugin/local paths standard conform...
NOTE: Please refer to the migration notes!
+ * 2352 FIX: FreeBSD Agent: Removed statgrab cpu section because there is a dedicated cpu section...
Multisite:
* 2314 FIX: Availability: fixed exception when grouping by host or service group
diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd
index d68f8d9..1e95e91 100755
--- a/agents/check_mk_agent.freebsd
+++ b/agents/check_mk_agent.freebsd
@@ -398,9 +398,8 @@ if cd $LOCALDIR ; then
done
fi
-
-echo '<<<local>>>'
-if cd $LOCALDIR ; then
+# Plugins
+if cd $PLUGINSDIR; then
for skript in $(ls) ; do
if [ -f "$skript" -a -x "$skript" ] ; then
./$skript
@@ -409,7 +408,7 @@ if cd $LOCALDIR ; then
# Call some plugins only every X'th minute
for skript in [1-9]*/* ; do
if [ -x "$skript" ] ; then
- run_cached local_${skript//\//\\} ${skript%/*} "$skript"
+ run_cached plugins_${skript//\//\\} ${skript%/*} "$skript"
fi
done
fi
Module: check_mk
Branch: master
Commit: 195ace2508380493da70ab9ce41fb1dd7ae8b69d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=195ace25083804…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Jun 29 11:11:36 2015 +0200
Updated bug entries #2316
---
.bugs/2316 | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/.bugs/2316 b/.bugs/2316
new file mode 100644
index 0000000..d2b2e4e
--- /dev/null
+++ b/.bugs/2316
@@ -0,0 +1,12 @@
+Title: Make notifications mechanics synchronous (improve reliability)
+Component: notifcation
+State: open
+Date: 2015-06-29 11:09:35
+Targetversion: 1.2.7
+Class: feature
+
+Currently all notifications are asynchronous without control of success or failure.
+We should redesign this API to be either synchronous and establish a back channel
+for informing the user about notification failures e.g. using the monitoring log.
+
+Maybe we need to change the mail notifications to use SMTP directly.
Module: check_mk
Branch: master
Commit: d82c4c10b47ecc9ac8c4c38bfd28597ecb352a89
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d82c4c10b47ecc…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Jun 29 10:59:57 2015 +0200
Fixed inline comment
---
agents/plugins/mk_postgres | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/agents/plugins/mk_postgres b/agents/plugins/mk_postgres
index 2092204..12fd191 100755
--- a/agents/plugins/mk_postgres
+++ b/agents/plugins/mk_postgres
@@ -49,7 +49,7 @@ OUTPUT="$(echo "select $QNAME = '<IDLE>', count(*) from pg_stat_activity group b
su - $USER -c "psql -X --variable ON_ERROR_STOP=1 -d postgres -A -t -F' '" 2>/dev/null)"
echo "$OUTPUT"
-# line with number of idle sessions is sometimes missing on Postgre 8.x. This can lead
+# line with number of idle sessions is sometimes missing on Postgres 8.x. This can lead
# to an altogether empty section and thus the check disappearing.
echo "$OUTPUT" | grep -q '^t ' || echo "t 0"