Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: Fix typo in man page

by Mathias Kettner

Module: check_mk Branch: master Commit: 65edbc56df19e2f20fd92be121f52d0e4a441942 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65edbc56df19e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 24 13:57:28 2014 +0200 Fix typo in man page --- checkman/kaspersky_av_tasks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/kaspersky_av_tasks b/checkman/kaspersky_av_tasks index 6ca4035..8465e6d 100644 --- a/checkman/kaspersky_av_tasks +++ b/checkman/kaspersky_av_tasks @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: This checks if the tasks Real-time protection and System EventManger are running. - Otherwise a critical state will be triggert + Otherwise a critical state will be triggered. You need to install the plugin {kaspersky_av} into the {plugins} directory of your agent. inventory:

10 years, 1 month

Check_MK Git: check_mk: Added option -f, --force for agent bakery

by Mathias Kettner

Module: check_mk Branch: master Commit: 766bdd9a06c4b474a60708b90d21f22a6fc9f34b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=766bdd9a06c4b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 24 13:55:00 2014 +0200 Added option -f,--force for agent bakery --- modules/check_mk.py | 12 ++++++++---- modules/check_mk_base.py | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index fbff765..70815fc 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4740,7 +4740,7 @@ def usage(): cmk --create-rrd [--keepalive|SPEC] create round robin database cmk -i, --inventory [HOST1 HOST2...] Do a HW/SW-Inventory of some ar all hosts cmk --inventory-as-check HOST Do HW/SW-Inventory, behave like check plugin - cmk -A, --bake-agents [H1 H2 ..] Bake agents for hosts (no in all versions) + cmk -A, --bake-agents [-f] [H1 H2..] Bake agents for hosts (not in all versions) cmk -V, --version print version cmk -h, --help print this help @@ -4852,7 +4852,9 @@ NOTES: defines gateway hosts and parent declarations. -A, --bake-agents creates RPM/DEB/MSI packages with host-specific - monitoring agents. Note: this feature is only contained in the + monitoring agents. If you add the option -f, --force then all + agents are renewed, even if an uptodate version for a configuration + already exists. Note: baking agents is only contained in the subscription version of Check_MK. @@ -5941,11 +5943,11 @@ def output_profile(): # Do option parsing and execute main function - # if check_mk is not called as module if __name__ == "__main__": - short_options = 'ASHVLCURODMmd:Ic:nhvpXPNBil' + short_options = 'ASHVLCURODMmd:Ic:nhvpXPNBilf' long_options = [ "help", "version", "verbose", "compile", "debug", "interactive", "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", "flush", "package", "localize", "donate", "snmpwalk", "oid=", "extraoid=", - "snmptranslate", "bake-agents", + "snmptranslate", "bake-agents", "force", "usewalk", "scan-parents", "procs=", "automation=", "notify", "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", @@ -5976,6 +5978,8 @@ if __name__ == "__main__": for o,a in opts: if o in [ '-v', '--verbose' ]: opt_verbose = True + elif o in [ '-f', '--force' ]: + opt_force = True elif o == '-c': check_mk_configfile = a elif o == '--cache': diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 868b929..dfa1d03 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -108,6 +108,7 @@ opt_cmc_relfilename = "config" opt_keepalive_fd = None opt_oids = [] opt_extra_oids = [] +opt_force = False # register SIGINT handler for consistenct CTRL+C handling def interrupt_handler(signum, frame):

10 years, 1 month

Check_MK Git: check_mk: Added further file headers

by Mathias Kettner

Module: check_mk Branch: master Commit: 9888f6f1eae1d24ae518a08c46088f54bb7bd2da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9888f6f1eae1d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 24 11:24:02 2014 +0200 Added further file headers --- agents/check_mk_agent.hpux | 2 +- agents/mk-job | 2 +- agents/special/agent_activemq | 26 +++++++++++++++++++++++++- agents/special/agent_allnet_ip_sensoric | 4 ++-- agents/special/agent_emcvnx | 4 ++-- agents/special/agent_fritzbox | 4 ++-- agents/special/agent_ibmsvc | 4 ++-- agents/special/agent_innovaphone | 26 +++++++++++++++++++++++++- agents/special/agent_random | 25 +++++++++++++++++++++++++ agents/special/agent_vsphere | 4 ++-- agents/special/agent_vsphere.pysphere | 4 ++-- doc/helpers/headrify | 5 +++-- 12 files changed, 92 insertions(+), 18 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9888f6f1ea…

10 years, 1 month

Check_MK Git: check_mk: Cleanup main Makefile a bit

by Mathias Kettner

Module: check_mk Branch: master Commit: 38937d9ee7c112d7c07c63690c85a453dac0abfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38937d9ee7c112… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 24 11:09:47 2014 +0200 Cleanup main Makefile a bit --- Makefile | 73 +++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 0bd0218..847971e 100644 --- a/Makefile +++ b/Makefile @@ -34,11 +34,25 @@ LIBDIR = $(PREFIX)/lib/$(NAME) DISTNAME = $(NAME)-$(VERSION) TAROPTS = --owner=root --group=root --exclude=.svn --exclude=*~ \ --exclude=.gitignore --exclude=.*.swp --exclude=.f12 + +# File to pack into livestatus-$(VERSION).tar.gz LIVESTATUS_SOURCES = configure aclocal.m4 config.guess config.h.in config.sub \ configure.ac ltmain.sh Makefile.am Makefile.in missing \ - nagios/README nagios/*.h nagios4/README nagios4/*.h src/*.{h,c,cc} src/Makefile.{in,am} \ + nagios/README nagios/*.h nagios4/README nagios4/*.h \ + src/*.{h,c,cc} src/Makefile.{in,am} \ depcomp install-sh api/python/{*.py,README} api/perl/* +# Files that are checked for trailing spaces +HEAL_SPACES_IN = checkman/* modules/* checks/* notifications/* inventory/* \ + $$(find -name Makefile) livestatus/src/*{cc,c,h} \ + web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ + doc/helpers/* scripts/setup.sh scripts/autodetect.py \ + $$(find pnp-templates -type f -name "*.php") \ + mkeventd/bin/mkeventd mkeventd/web/htdocs/*.py mkeventd/web/plugins/*/*.py \ + mkeventd/src/*.c mkeventd/checks/* check_mk_templates.cfg \ + doc/treasures/mknotifyd agents/check_mk_agent* \ + $$(find agents/plugins -type f) + .PHONY: help install clean @@ -62,11 +76,6 @@ check-binaries: echo -n "Checking precompiled binaries..." && file agents/waitmax | grep 32-bit >/dev/null && echo OK ; \ fi -check-version: - @sed -n 1p ChangeLog | fgrep -qx '$(VERSION):' || { \ - echo "Version $(VERSION) not listed at top of ChangeLog!" ; \ - false ; } - check: check-spaces check-permissions check-binaries check-version @@ -140,6 +149,11 @@ mk-livestatus: rm -rf mk-livestatus-$(VERSION) +check-version: + @sed -n 1p ChangeLog | fgrep -qx '$(VERSION):' || { \ + echo "Version $(VERSION) not listed at top of ChangeLog!" ; \ + false ; } + version: [ "$$(head -c 12 /etc/issue)" = "Ubuntu 10.10" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 11.04" \ @@ -227,43 +241,38 @@ deb-agent: $(NAME)-agent-$(VERSION)-1.noarch.rpm $(NAME)-agent-logwatch-$(VERSIO done -clean: - rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe \ - mkeventd-*.tar.gz mk-livestatus-*.tar.gz \ - $(NAME)-*.tar.gz *~ counters autochecks \ - precompiled cache - find -name "*~" | xargs rm -f - -mrproper: - git clean -xfd -e .bugs 2>/dev/null || git clean -xfd +setup: + $(MAKE) dist + rm -rf $(DISTNAME) + tar xzf $(DISTNAME).tar.gz + cd $(DISTNAME) && ./setup.sh --yes + rm -rf $(DISTNAME) + check_mk -R + /etc/init.d/apache2 reload -SOURCE_FILES = checkman/* modules/* checks/* notifications/* inventory/* $$(find -name Makefile) \ - livestatus/src/*{cc,c,h} web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ - doc/helpers/* scripts/setup.sh scripts/autodetect.py $$(find pnp-templates -type f -name "*.php") \ - mkeventd/bin/mkeventd mkeventd/web/htdocs/*.py mkeventd/web/plugins/*/*.py mkeventd/src/*.c \ - mkeventd/checks/* check_mk_templates.cfg doc/treasures/mknotifyd agents/check_mk_agent* \ - $$(find agents/plugins -type f) check-spaces: @echo -n "Checking for trailing spaces..." - @if grep -q '[[:space:]]$$' $(SOURCE_FILES) ; then echo $$? ; figlet "Space error" \ + @if grep -q '[[:space:]]$$' $(HEAL_SPACES_IN) ; then echo $$? ; figlet "Space error" \ ; echo "Aborting due to trailing spaces. Please use 'make healspaces' to repair." \ ; echo "Affected files: " \ - ; grep -l '[[:space:]]$$' $(SOURCE_FILES) \ + ; grep -l '[[:space:]]$$' $(HEAL_SPACES_IN) \ ; exit 1 ; fi @echo OK + healspaces: @echo "Removing trailing spaces from code lines..." - @sed -ri 's/[[:space:]]+$$//g' $(SOURCE_FILES) + @sed -ri 's/[[:space:]]+$$//g' $(HEAL_SPACES_IN) -setup: - $(MAKE) dist - rm -rf $(DISTNAME) - tar xzf $(DISTNAME).tar.gz - cd $(DISTNAME) && ./setup.sh --yes - rm -rf $(DISTNAME) - check_mk -R - /etc/init.d/apache2 reload +clean: + rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe \ + mkeventd-*.tar.gz mk-livestatus-*.tar.gz \ + $(NAME)-*.tar.gz *~ counters autochecks \ + precompiled cache + find -name "*~" | xargs rm -f + +mrproper: + git clean -xfd -e .bugs 2>/dev/null || git clean -xfd

10 years, 1 month

Check_MK Git: check_mk: Removed some trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: ca3a087f8306529490afebd060500c1556d5a7f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca3a087f830652… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 24 11:09:39 2014 +0200 Removed some trailing spaces --- agents/plugins/hpux_lunstats | 4 +- agents/plugins/hpux_statgrab | 6 +- agents/plugins/mk_oracle.solaris | 14 ++--- agents/plugins/nfsexports.solaris | 114 ++++++++++++++++++------------------- 4 files changed, 69 insertions(+), 69 deletions(-) diff --git a/agents/plugins/hpux_lunstats b/agents/plugins/hpux_lunstats index e7e5cbb..822ddfd 100644 --- a/agents/plugins/hpux_lunstats +++ b/agents/plugins/hpux_lunstats @@ -1,8 +1,8 @@ #!/usr/bin/ksh # Put this file into /usr/lib/check_mk_agent/plugins. Then -# reinventorize your host. -# Actually querying these stats is quite slow since they freshly update +# reinventorize your host. +# Actually querying these stats is quite slow since they freshly update # on each call. If you have a few 1000 luns then this will not work. get_stats() diff --git a/agents/plugins/hpux_statgrab b/agents/plugins/hpux_statgrab index f0a1a29..b054173 100644 --- a/agents/plugins/hpux_statgrab +++ b/agents/plugins/hpux_statgrab @@ -14,10 +14,10 @@ if which statgrab > /dev/null ; then echo "<<<statgrab_$s>>>" cat /tmp/statgrab.$$ | grep "^$s\." | cut -d. -f2-99 | sed 's/ *= */ /' done - + echo '<<<statgrab_mem>>>' cat /tmp/statgrab.$$ | egrep "^(swap|mem)\." | sed 's/ *= */ /' - + fi [ -f /tmp/statgrab.$$ ] && rm -f /tmp/statgrab.$$ -fi +fi diff --git a/agents/plugins/mk_oracle.solaris b/agents/plugins/mk_oracle.solaris index 194fda9..a21276d 100644 --- a/agents/plugins/mk_oracle.solaris +++ b/agents/plugins/mk_oracle.solaris @@ -30,7 +30,7 @@ # Get list of all running databases SIDS=$(UNIX95=true ps -ef -o args | sed -n '/^ora_pmon_/p;/^xe_pmon_/p' | sed -n '/^[a-z]*_pmon_$[^ ]*$/s//\1/p') -if [ -z "$SIDS" ] ; then +if [ -z "$SIDS" ] ; then # If on this system we've already found a database if [ -e "$MK_CONFDIR/mk_oracle.found" ] ; then echo '<<<oracle_version>>>' @@ -56,7 +56,7 @@ then fi # You can specify a list of SIDs to monitor. Those databases will -# only be handled, if they are found running, though! +# only be handled, if they are found running, though! # # ONLY_SIDS="XE HIRN SEPP" # @@ -103,11 +103,11 @@ for SID in $SIDS; do if [ "$S" = "$SID" ] ; then SKIP= break - fi + fi done if [ "$SKIP" ] ; then continue ; fi fi - + EXCLUDE=EXCLUDE_$SID EXCLUDE=${!EXCLUDE} # SID filtered totally? @@ -135,11 +135,11 @@ for SID in $SIDS; do fi # If the cache file exists, output it, regardless of its age. If it's outdated - # then it will be recreated *asynchronously*. It's new contents will not + # then it will be recreated *asynchronously*. It's new contents will not # be available here anyway. if [ -s "$CACHE_FILE" ] ; then cat "$CACHE_FILE" ; fi - # When the cache file is not valid, we recreated it, but only if there is not + # When the cache file is not valid, we recreated it, but only if there is not # yet a background process from a previous check still doing this! We see this # because of the existance of the .new file # When the cache is old and there is no *new file present, then start a query @@ -193,7 +193,7 @@ for SID in $SIDS; do f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, 'TEMP', t.block_size, t.status; EOF - fi + fi } > $CACHE_FILE.new && mv $CACHE_FILE.new $CACHE_FILE || rm -f $CACHE_FILE* " fi diff --git a/agents/plugins/nfsexports.solaris b/agents/plugins/nfsexports.solaris index c953a08..fb180a3 100644 --- a/agents/plugins/nfsexports.solaris +++ b/agents/plugins/nfsexports.solaris @@ -1,57 +1,57 @@ -#!/usr/bin/bash -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2010 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. - -# Check_MK agent plugin for monitoring nfsexports on Solaris. This plugin -# has been tested with solaris 10 in a standalone and cluster setting. - -clusterconfigdir="/etc/cluster/ccr/global/directory" -if [ -r $clusterconfigdir ]; then - # is a clustered nfs server - nfsconfig=/etc/cluster/ccr/global/`grep rgm $clusterconfigdir | grep nfs | grep rg_` - if [ -r $nsconfig ]; then - Pathprefix=`grep Pathprefix $nfsconfig | awk {'print $2'}`/SUNW.nfs - dfstabfile=$Pathprefix/dfstab.`grep -v FilesystemMountPoints $nfsconfig | grep SUNW.nfs | \ - awk {'print $1'} | sed -e 's/RS_//'` - if [ -r $dfstabfile ]; then - EXPORTS=`grep -v ^# $dfstabfile | grep -v ^$` - ps -aef | grep nfsd | grep $Pathprefix >/dev/null && DAEMONS="ok" - fi - fi -else - # is a standalone nfs server - dfstabfile="/etc/dfs/dfstab" - if [ -r $dfstabfile ]; then - EXPORTS=`grep -v ^# $dfstabfile | grep -v ^$` - svcs -a | grep nfs/server | grep ^online >/dev/null && DAEMONS="ok" - fi -fi - -# any exports or have running daemons? then look for registered exports -if [ "$EXPORTS" ]; then - echo "<<<nfsexports>>>" - if [ "$DAEMONS" ]; then - showmount -e | grep ^/ - fi -fi +#!/usr/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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. + +# Check_MK agent plugin for monitoring nfsexports on Solaris. This plugin +# has been tested with solaris 10 in a standalone and cluster setting. + +clusterconfigdir="/etc/cluster/ccr/global/directory" +if [ -r $clusterconfigdir ]; then + # is a clustered nfs server + nfsconfig=/etc/cluster/ccr/global/`grep rgm $clusterconfigdir | grep nfs | grep rg_` + if [ -r $nsconfig ]; then + Pathprefix=`grep Pathprefix $nfsconfig | awk {'print $2'}`/SUNW.nfs + dfstabfile=$Pathprefix/dfstab.`grep -v FilesystemMountPoints $nfsconfig | grep SUNW.nfs | \ + awk {'print $1'} | sed -e 's/RS_//'` + if [ -r $dfstabfile ]; then + EXPORTS=`grep -v ^# $dfstabfile | grep -v ^$` + ps -aef | grep nfsd | grep $Pathprefix >/dev/null && DAEMONS="ok" + fi + fi +else + # is a standalone nfs server + dfstabfile="/etc/dfs/dfstab" + if [ -r $dfstabfile ]; then + EXPORTS=`grep -v ^# $dfstabfile | grep -v ^$` + svcs -a | grep nfs/server | grep ^online >/dev/null && DAEMONS="ok" + fi +fi + +# any exports or have running daemons? then look for registered exports +if [ "$EXPORTS" ]; then + echo "<<<nfsexports>>>" + if [ "$DAEMONS" ]; then + showmount -e | grep ^/ + fi +fi

10 years, 1 month

Check_MK Git: check_mk: Moved all Unix plugin into one directory

by Mathias Kettner

Module: check_mk Branch: master Commit: 4a0aba18bb02ac449e50d4f13c437fbf7bef9008 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a0aba18bb02ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 24 11:03:15 2014 +0200 Moved all Unix plugin into one directory --- agents/{hpux => plugins}/hpux_lunstats | 0 agents/{hpux => plugins}/hpux_statgrab | 0 agents/{solaris/mk_oracle => plugins/mk_oracle.solaris} | 0 agents/{solaris => plugins}/nfsexports.solaris | 0 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/hpux/hpux_lunstats b/agents/plugins/hpux_lunstats similarity index 100% rename from agents/hpux/hpux_lunstats rename to agents/plugins/hpux_lunstats diff --git a/agents/hpux/hpux_statgrab b/agents/plugins/hpux_statgrab similarity index 100% rename from agents/hpux/hpux_statgrab rename to agents/plugins/hpux_statgrab diff --git a/agents/solaris/mk_oracle b/agents/plugins/mk_oracle.solaris similarity index 100% rename from agents/solaris/mk_oracle rename to agents/plugins/mk_oracle.solaris diff --git a/agents/solaris/nfsexports.solaris b/agents/plugins/nfsexports.solaris similarity index 100% rename from agents/solaris/nfsexports.solaris rename to agents/plugins/nfsexports.solaris

10 years, 1 month

Check_MK Git: check_mk: arc_raid_status: run agent plugin asynchronously every 5 minutes

by Mathias Kettner

Module: check_mk Branch: master Commit: 360d29eeab67a7e93c666cc169113faf3bd4cc1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=360d29eeab67a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 24 11:00:53 2014 +0200 arc_raid_status: run agent plugin asynchronously every 5 minutes --- agents/check_mk_agent.linux | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9816929..be11b02 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -372,8 +372,7 @@ fi # RAID controllers from areca (Taiwan) # cli64 can be found at ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/CLI/ if type cli64 >/dev/null ; then - echo "<<<arc_raid_status>>>" - cli64 rsf info | tail -n +3 | head -n -2 + run_cached -s arc_raid_status 300 "cli64 rsf info | tail -n +3 | head -n -2" fi # VirtualBox Guests. Section must always been output. Otherwise the

10 years, 1 month

Check_MK Git: check_mk: Fix man page format for jar_signature

by Mathias Kettner

Module: check_mk Branch: master Commit: f96ba34352bac7f5009077a46ed1ca8553672ba8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f96ba34352bac7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 23 19:31:32 2014 +0200 Fix man page format for jar_signature --- checkman/jar_signature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/jar_signature b/checkman/jar_signature index 60c6600..3e1a927 100644 --- a/checkman/jar_signature +++ b/checkman/jar_signature @@ -11,7 +11,7 @@ description: Returns {CRIT} if the certificate will expire within the next 30 days or already is expired. - Make sure You have the jar_signature agent plugin installed and configured + Make sure You have the {jar_signature} agent plugin installed and configured on the monitored machines. (It uses the program "jarsigner" there to read ssl certificate information of jar files.)

10 years, 1 month

Check_MK Git: check_mk: #1376 dmraid: moved plugin code into normal Linux agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 0a8ff5a905f64e851ebd9caa04380b6bf234d1f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a8ff5a905f64e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 23 19:22:54 2014 +0200 #1376 dmraid: moved plugin code into normal Linux agent The agent plugin <tt>dmraid</tt> for monitoring Linux software RAID via device mapper has been moved into the main Linux agent. This is done for simplification and for consitancy with the other RAID monitoring. --- .werks/1376 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 45 +++++++++++++++++++++++++++++-------------- agents/plugins/dmraid | 43 ----------------------------------------- checks/dmraid | 11 +++++------ 5 files changed, 48 insertions(+), 63 deletions(-) diff --git a/.werks/1376 b/.werks/1376 new file mode 100644 index 0000000..31586d1 --- /dev/null +++ b/.werks/1376 @@ -0,0 +1,11 @@ +Title: dmraid: moved plugin code into normal Linux agent +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408814499 +Class: feature + +The agent plugin <tt>dmraid</tt> for monitoring Linux software RAID via +device mapper has been moved into the main Linux agent. This is done +for simplification and for consitancy with the other RAID monitoring. diff --git a/ChangeLog b/ChangeLog index 8fdba52..4aabe78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * 1374 arc_raid_status: moved plugin into main Linux agent... 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... * 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/check_mk_agent.linux b/agents/check_mk_agent.linux index 626d967..9816929 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -226,22 +226,12 @@ echo '<<<tcp_conn_stats>>>' # New implementation: netstat is very slow for large TCP tables cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }' -# Platten- und RAID-Status von LSI-Controlleren, falls vorhanden -if type cfggen > /dev/null ; then - echo '<<<lsi>>>' - cfggen 0 DISPLAY | egrep '(Target ID|State|Volume ID|Status of volume)[[:space:]]*:' | sed -e 's/ *//g' -e 's/:/ /' -fi - -# Multipathgeraete +# Linux Multipathing if type multipath >/dev/null ; then echo '<<<multipath>>>' multipath -l fi -# Soft-RAID -echo '<<<md>>>' -cat /proc/mdstat - # Performancecounter Platten echo '<<<diskstat>>>' date +%s @@ -313,9 +303,36 @@ then ) 200>>"$sdrcache" fi -# State of LSI MegaRAID controller via MegaCli. You can download that tool from: -# http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/8.02.16_MegaC… +# RAID status of Linux software RAID +echo '<<<md>>>' +cat /proc/mdstat + +# RAID status of Linux RAID via device mapper +if type dmraid >/dev/null && DMSTATUS=$(dmraid -r) +then + echo '<<<dmraid>>>' + + # Output name and status + dmraid -s | grep -e ^name -e ^status + + # Output disk names of the RAID disks + DISKS=$(echo "$DMSTATUS" | cut -f1 -d\:) + + for disk in $DISKS ; do + device=$(cat /sys/block/$(basename $disk)/device/model ) + status=$(echo "$DMSTATUS" | grep ^${disk}) + echo "$status Model: $device" + done +fi +# RAID status of LSI controllers via cfggen +if type cfggen > /dev/null ; then + echo '<<<lsi>>>' + cfggen 0 DISPLAY | egrep '(Target ID|State|Volume ID|Status of volume)[[:space:]]*:' | sed -e 's/ *//g' -e 's/:/ /' +fi + +# RAID status of LSI MegaRAID controller via MegaCli. You can download that tool from: +# http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/8.02.16_MegaC… if type MegaCli >/dev/null ; then MegaCli_bin="MegaCli" elif type MegaCli64 >/dev/null ; then @@ -340,7 +357,7 @@ if [ "$MegaCli_bin" != "unknown" ]; then $MegaCli_bin -AdpBbuCmd -GetBbuStatus -aALL -NoLog < /dev/null | grep -v Exit fi -# 3WARE disk controller (by Radoslaw Bak) +# RAID status of 3WARE disk controller (by Radoslaw Bak) if type tw_cli > /dev/null ; then for C in $(tw_cli show | awk 'NR < 4 { next } { print $1 }'); do echo '<<<3ware_info>>>' diff --git a/agents/plugins/dmraid b/agents/plugins/dmraid deleted file mode 100755 index e3c0b12..0000000 --- a/agents/plugins/dmraid +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2013 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. - -echo '<<<dmraid>>>' - -STATUS=$(dmraid -r) -if [ $? != 0 ]; then - exit 1 -fi - -# Name und Status ausgeben -dmraid -s | grep -e ^name -e ^status - -# Diskname der Raidplatten ausgeben -DISKS=$(echo "$STATUS" | cut -f1 -d\:) - -for disk in $DISKS ; do - device=$(cat /sys/block/$(basename $disk)/device/model ) - status=$(echo "$STATUS" | grep ^${disk}) - echo "$status Model: $device" -done diff --git a/checks/dmraid b/checks/dmraid index 93f40ad..20da853 100644 --- a/checks/dmraid +++ b/checks/dmraid @@ -27,14 +27,13 @@ # Author: Markus Lengler <ml(a)lengler-it.de> - # Example outputs from agent: # -#<<<dmraid>>> -#name : isw_ebdabbedfh_system -#status : ok -#/dev/sda: isw, "isw_ebdabbedfh", GROUP, ok, 976773166 sectors, data@ 0 Model: WDC WD5002ABYS-5 -#/dev/sdb: isw, "isw_ebdabbedfh", GROUP, ok, 976773166 sectors, data@ 0 Model: WDC WD5002ABYS-5 +# <<<dmraid>>> +# name : isw_ebdabbedfh_system +# status : ok +# /dev/sda: isw, "isw_ebdabbedfh", GROUP, ok, 976773166 sectors, data@ 0 Model: WDC WD5002ABYS-5 +# /dev/sdb: isw, "isw_ebdabbedfh", GROUP, ok, 976773166 sectors, data@ 0 Model: WDC WD5002ABYS-5 def inventory_dmraid(checkname, info):

10 years, 1 month

Check_MK Git: check_mk: Moved some old plugins to doc/treasures/deprecated

by Mathias Kettner

Module: check_mk Branch: master Commit: 28b5beae32aa057349e6cbaa353d2c16b35f44ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28b5beae32aa05… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 23 19:12:09 2014 +0200 Moved some old plugins to doc/treasures/deprecated --- checks/dmi_sysinfo | 2 ++ doc/treasures/deprecated/README | 4 ++++ {agents => doc/treasures/deprecated/agents}/plugins/dmi_sysinfo | 0 .../treasures/deprecated/agents}/plugins/j4p_performance | 0 {agents => doc/treasures/deprecated/agents}/plugins/sylo | 0 5 files changed, 6 insertions(+) diff --git a/checks/dmi_sysinfo b/checks/dmi_sysinfo index 08f7907..8edb4a1 100644 --- a/checks/dmi_sysinfo +++ b/checks/dmi_sysinfo @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Note: this check is deprecated. It is superseeded by the new +# Check_MK HW/SW-Inventory. def inventory_dmi_sysinfo(checkname, info): if len(info) > 0 and info[0] == ['System', 'Information']: diff --git a/doc/treasures/deprecated/README b/doc/treasures/deprecated/README new file mode 100644 index 0000000..c7820f7 --- /dev/null +++ b/doc/treasures/deprecated/README @@ -0,0 +1,4 @@ +Here you find parts of Check_MK that might still work, but are +deprecated. In most cases the reason is that something newer, +better, cleaner, more elegant, less buggy exists that makes the +thing obsolete. diff --git a/agents/plugins/dmi_sysinfo b/doc/treasures/deprecated/agents/plugins/dmi_sysinfo similarity index 100% rename from agents/plugins/dmi_sysinfo rename to doc/treasures/deprecated/agents/plugins/dmi_sysinfo diff --git a/agents/plugins/j4p_performance b/doc/treasures/deprecated/agents/plugins/j4p_performance similarity index 100% rename from agents/plugins/j4p_performance rename to doc/treasures/deprecated/agents/plugins/j4p_performance diff --git a/agents/plugins/sylo b/doc/treasures/deprecated/agents/plugins/sylo similarity index 100% rename from agents/plugins/sylo rename to doc/treasures/deprecated/agents/plugins/sylo

10 years, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2014