[checkmk-commits] Check_MK Git: check_mk: #2352 FIX FreeBSD Agent: Removed statgrab cpu section because there is a dedicated cpu section

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 &lt;lm(a)mathias-kettner.de&gt; 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