Module: check_mk
Branch: master
Commit: 822c06be0ffa13797ec75fdc455f7da9a1f62b47
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=822c06be0ffa13…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Aug 24 18:33:49 2014 +0200
Fixed TT font in two man pages
---
checkman/unitrends_backup | 2 +-
checkman/unitrends_replication | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/checkman/unitrends_backup b/checkman/unitrends_backup
index f20060e..590efc4 100644
--- a/checkman/unitrends_backup
+++ b/checkman/unitrends_backup
@@ -5,7 +5,7 @@ license: GPL
distribution: check_mk
description:
Unitrends is a enterprise class backup solution.
- This check needs the <tt>unitrends_backup</tt> plugin installed on the unitrends server
+ This check needs the {unitrends_backup} plugin installed on the unitrends server
in order to work. The plugin will deliver a complete list of all schedules including
a sublist of a jobs in this schdule from the last 24 hours.
diff --git a/checkman/unitrends_replication b/checkman/unitrends_replication
index d45bad2..cfbce91 100644
--- a/checkman/unitrends_replication
+++ b/checkman/unitrends_replication
@@ -5,7 +5,7 @@ license: GPL
distribution: check_mk
description:
Unitrends is an enterprise class backup solution.
- This check needs the <tt>unitrends_replication</tt> plugin installed on the unitrends server
+ This check needs the {unitrends_replication} plugin installed on the unitrends server
in order to work. The plugin will deliver a complete list of all replication entries and
her status
Module: check_mk
Branch: master
Commit: 9a0257d54701e788f7097fb4c3a87482181d18fa
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a0257d54701e7…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Aug 24 18:15:09 2014 +0200
#1377 Renamed agent plugin resolve_hostname into dnsclient, make portable to all Unices
The small agent plugin <tt>dnsclient</tt> simply uses <tt>nslookup</tt> in order
to try the local resolver. It now should work on Linux, AIX, HP-UX and Solaris,
provided the tool <tt>nslookup</tt> is installed and in the search path. It
now also supports resolving several addresses.
---
.werks/1377 | 13 +++++++++++
ChangeLog | 1 +
agents/plugins/{resolve_hostname => dnsclient} | 28 ++++++++++++++----------
3 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/.werks/1377 b/.werks/1377
new file mode 100644
index 0000000..81eeb05
--- /dev/null
+++ b/.werks/1377
@@ -0,0 +1,13 @@
+Title: Renamed agent plugin resolve_hostname into dnsclient, make portable to all Unices
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i6
+Date: 1408896816
+Class: feature
+
+The small agent plugin <tt>dnsclient</tt> simply uses <tt>nslookup</tt> in order
+to try the local resolver. It now should work on Linux, AIX, HP-UX and Solaris,
+provided the tool <tt>nslookup</tt> is installed and in the search path. It
+now also supports resolving several addresses.
+
diff --git a/ChangeLog b/ChangeLog
index 4aabe78..ef7e7f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@
NOTE: Please refer to the migration notes!
* 1375 vxvm_enclosures, vxvm_multipath, vxvm_objstatus: joined into one agent plugin called vxvm...
* 1376 dmraid: moved plugin code into normal Linux agent...
+ * 1377 Renamed agent plugin resolve_hostname into dnsclient, make portable to all Unices...
* 1051 FIX: tcp_conn_stats: fix missing performance data...
* 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked
* 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries
diff --git a/agents/plugins/resolve_hostname b/agents/plugins/dnsclient
similarity index 76%
rename from agents/plugins/resolve_hostname
rename to agents/plugins/dnsclient
index c14b19f..403a8ce 100755
--- a/agents/plugins/resolve_hostname
+++ b/agents/plugins/dnsclient
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# +------------------------------------------------------------------+
# | ____ _ _ __ __ _ __ |
# | / ___| |__ ___ ___| | __ | \/ | |/ / |
@@ -27,18 +27,22 @@
# address using the local resolver of the system this script is
# running on.
-HOSTADDRESS=mathias-kettner.de
+HOSTADDRESSES=mathias-kettner.de
-OUTPUT=$(nslookup $HOSTADDRESS 2>&1)
-RC=$?
-if [ $RC -ne 0 ]; then
- STATE=2
- OUTPUT="CRIT - $HOSTADDRESS could not be resolved"
-else
- STATE=0
- ADDRESSES=$(echo "$OUTPUT" | tail -n+3 | grep Address: | cut -d" " -f2)
- OUTPUT="OK - $HOSTADDRESS resolved to ${ADDRESSES//$'\n'/, }"
+if [ -e $MK_CONFDIR/dnsclient.cfg ] ; then
+ . $MK_CONFDIR/dnsclient.cfg
fi
echo "<<<mrpe>>>"
-echo "Resolve_$HOSTADDRESS $STATE $OUTPUT"
+for HOSTADDRESS in $HOSTADDRESSES
+do
+ ADDRESSES=`nslookup $HOSTADDRESS | sed -n -e 1,3d -e '/^Address: *\(.*\)$/s//\1/p'`
+ if [ ! "$ADDRESSES" ] ; then
+ STATE=2
+ OUTPUT="CRIT - $HOSTADDRESS could not be resolved"
+ else
+ STATE=0
+ OUTPUT="OK - $HOSTADDRESS resolved into $ADDRESSES"
+ fi
+ echo Resolve_$HOSTADDRESS $STATE $OUTPUT
+done
Module: check_mk
Branch: master
Commit: fc29ec635337ce31e3370869100152385eeeb46e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc29ec635337ce…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Aug 24 16:27:11 2014 +0200
Moved mrpe_include to deprecated plugins
---
.../deprecated/agents/plugins/mrpe_include | 53 ++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/doc/treasures/deprecated/agents/plugins/mrpe_include b/doc/treasures/deprecated/agents/plugins/mrpe_include
new file mode 100755
index 0000000..908418e
--- /dev/null
+++ b/doc/treasures/deprecated/agents/plugins/mrpe_include
@@ -0,0 +1,53 @@
+#!/bin/bash
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# ails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+# Note: This script is deprecated and has been replaced by the script runas
+# which is able to handle mrpe, local and plugin scripts
+
+echo '<<<mrpe>>>'
+grep -Ev '^[[:space:]]*($|#)' "$MK_CONFDIR/mrpe_include.cfg" | \
+while read user include
+do
+ if [ -f $include ] ; then
+ PREFIX=""
+ if [ "$user" != "-" ] ; then
+ PREFIX="su $user -c "
+ fi
+
+ grep -Ev '^[[:space:]]*($|#)' "$include" | \
+ while read descr cmdline
+ do
+ PLUGIN=${cmdline%% *}
+ if [ -n "$PREFIX" ] ; then
+ cmdline="$PREFIX\"$cmdline\""
+ fi
+ OUTPUT=$(eval "$cmdline")
+ echo -n "(${PLUGIN##*/}) $descr $? $OUTPUT" | tr \\n \\1
+ echo
+ done
+ fi
+done
+
+
Module: check_mk
Branch: master
Commit: e8ec677e60cd48f3a1c9c90094f1be345d83152b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8ec677e60cd48…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Aug 24 16:26:53 2014 +0200
lnx_psperf: allow comments in config file
---
agents/plugins/.f12 | 2 +-
agents/plugins/lnx_psperf | 3 ++-
agents/plugins/mrpe_include | 53 -------------------------------------------
3 files changed, 3 insertions(+), 55 deletions(-)
diff --git a/agents/plugins/.f12 b/agents/plugins/.f12
index 2cdd4e4..5d08296 100755
--- a/agents/plugins/.f12
+++ b/agents/plugins/.f12
@@ -2,5 +2,5 @@
SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)}
SITE=${SITE:-$(omd sites --bare | head -n 1)}
# sudo mkdir -p /usr/lib/check_mk_agent/plugins
-sudo install -m 755 * /usr/lib/check_mk_agent/plugins || true
+# sudo install -m 755 * /usr/lib/check_mk_agent/plugins || true
sudo install -m 755 * /omd/sites/$SITE/share/check_mk/agents/plugins
diff --git a/agents/plugins/lnx_psperf b/agents/plugins/lnx_psperf
index f29fd06..c0946d2 100755
--- a/agents/plugins/lnx_psperf
+++ b/agents/plugins/lnx_psperf
@@ -38,10 +38,11 @@
if [ -e "$MK_CONFDIR/psperf.cfg" ] ; then
echo '<<<ps>>>'
echo '[proc_stat]'
+ egrep -v '^[[:space:]]*(#|$)' "$MK_CONFDIR/psperf.cfg" | \
while read LINE
do
for pid in $(pgrep $LINE) ; do
cat /proc/$pid/stat
done
- done < "$MK_CONFDIR/psperf.cfg"
+ done
fi
diff --git a/agents/plugins/mrpe_include b/agents/plugins/mrpe_include
deleted file mode 100755
index 908418e..0000000
--- a/agents/plugins/mrpe_include
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-# +------------------------------------------------------------------+
-# | ____ _ _ __ __ _ __ |
-# | / ___| |__ ___ ___| | __ | \/ | |/ / |
-# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
-# | | |___| | | | __/ (__| < | | | | . \ |
-# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
-# | |
-# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de |
-# +------------------------------------------------------------------+
-#
-# This file is part of Check_MK.
-# The official homepage is at http://mathias-kettner.de/check_mk.
-#
-# check_mk is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation in version 2. check_mk is distributed
-# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
-# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more de-
-# ails. You should have received a copy of the GNU General Public
-# License along with GNU Make; see the file COPYING. If not, write
-# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-# Boston, MA 02110-1301 USA.
-
-# Note: This script is deprecated and has been replaced by the script runas
-# which is able to handle mrpe, local and plugin scripts
-
-echo '<<<mrpe>>>'
-grep -Ev '^[[:space:]]*($|#)' "$MK_CONFDIR/mrpe_include.cfg" | \
-while read user include
-do
- if [ -f $include ] ; then
- PREFIX=""
- if [ "$user" != "-" ] ; then
- PREFIX="su $user -c "
- fi
-
- grep -Ev '^[[:space:]]*($|#)' "$include" | \
- while read descr cmdline
- do
- PLUGIN=${cmdline%% *}
- if [ -n "$PREFIX" ] ; then
- cmdline="$PREFIX\"$cmdline\""
- fi
- OUTPUT=$(eval "$cmdline")
- echo -n "(${PLUGIN##*/}) $descr $? $OUTPUT" | tr \\n \\1
- echo
- done
- fi
-done
-
-
Module: check_mk
Branch: master
Commit: 4ed8de5e7ab8f0f74b1ca6c03add6a717ef6685d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ed8de5e7ab8f0…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Aug 24 14:02:47 2014 +0200
Fixed further typos in man pages
---
checkman/kaspersky_av_quarantine | 6 +++---
checkman/kaspersky_av_tasks | 2 +-
checkman/kaspersky_av_updates | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/checkman/kaspersky_av_quarantine b/checkman/kaspersky_av_quarantine
index f87f36a..f6bf86e 100644
--- a/checkman/kaspersky_av_quarantine
+++ b/checkman/kaspersky_av_quarantine
@@ -1,11 +1,11 @@
-title: Kaspersky Anti Virus Quarantine
+title: Kaspersky Anti-Virus Quarantine
agents: linux
catalog: app/kaspersky
license: GPL
distribution: check_mk
description:
- This check checks for file in quarantine reportet from kaspersku anti virus.
- A Critical State will be triggert if the quarantine queue isn'd empty.
+ This check checks for file in quarantine reportet from Kaspersky Anti-Virus.
+ A Critical state will be triggered if the quarantine queue is not empty.
You need to install the plugin {kaspersky_av} into the {plugins} directory of your agent.
inventory:
diff --git a/checkman/kaspersky_av_tasks b/checkman/kaspersky_av_tasks
index 8465e6d..214eb9e 100644
--- a/checkman/kaspersky_av_tasks
+++ b/checkman/kaspersky_av_tasks
@@ -1,4 +1,4 @@
-title: Kaspersky Anti Virus Program Tasks status
+title: Kaspersky Anti-Virus tasks status
agents: linux
catalog: app/kaspersky
license: GPL
diff --git a/checkman/kaspersky_av_updates b/checkman/kaspersky_av_updates
index 3ccc5bb..a75c137 100644
--- a/checkman/kaspersky_av_updates
+++ b/checkman/kaspersky_av_updates
@@ -1,4 +1,4 @@
-title: Kaspersky Anti Virus Update Status
+title: Kaspersky Anti-Virus updates
agents: linux
catalog: app/kaspersky
license: GPL