Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

Check_MK Git: check_mk: changed title of manpages under hw/environment: Always manufacturer first for better browsability in cmk -m

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: c101f9ee021212ced0cd8eaededb36e263f3dafa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c101f9ee021212… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jul 1 16:24:20 2013 +0200 changed title of manpages under hw/environment: Always manufacturer first for better browsability in cmk -m --- checkman/apc_symmetra_temp | 2 +- checkman/lgp_pdu_aux | 2 +- checkman/strem1_sensors | 2 +- checkman/ups_eaton_enviroment | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checkman/apc_symmetra_temp b/checkman/apc_symmetra_temp index 318e0ef..a5acadf 100644 --- a/checkman/apc_symmetra_temp +++ b/checkman/apc_symmetra_temp @@ -1,4 +1,4 @@ -title: Temperature via Symmetra APC Web/SNMP Management Card +title: APC Symmetra Web/SNMP Management Card: Temperature agents: snmp catalog: hw/environment author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/lgp_pdu_aux b/checkman/lgp_pdu_aux index 47b8d2f..4f12ece 100644 --- a/checkman/lgp_pdu_aux +++ b/checkman/lgp_pdu_aux @@ -1,4 +1,4 @@ -title: Monitors PDU AUX sensors from Liebert MPH/MPX devices +title: Liebert MPH/MPX devices: PDU AUX sensors agents: snmp catalog: hw/environment author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/strem1_sensors b/checkman/strem1_sensors index c906060..e243d39 100644 --- a/checkman/strem1_sensors +++ b/checkman/strem1_sensors @@ -1,4 +1,4 @@ -title: Temperature,humidity,wetness on sensatronic em1 devices +title: Sensatronic EM1 Devices: Temperature, humidity, wetness agents: snmp catalog: hw/environment author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/ups_eaton_enviroment b/checkman/ups_eaton_enviroment index 6abb0a6..acfbd9c 100644 --- a/checkman/ups_eaton_enviroment +++ b/checkman/ups_eaton_enviroment @@ -1,4 +1,4 @@ -title: Tempreature and Humidity Sensors for Eaton UPS devices +title: Eaton UPS Devices: Tempreature and Humidity Sensors agents: snmp catalog: hw/environment author: Bastian Kuhn <bk(a)mathias-kettner.de>

11 years, 2 months

Check_MK Git: check_mk: fixed inconsistency in catalog entries of manpages: mixed categories (containing as well subcategories as leaf node) are not allowed

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 9005e8510c95c46e1df6fa7a7babf855469e1fa0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9005e8510c95c4… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jul 1 16:06:02 2013 +0200 fixed inconsistency in catalog entries of manpages: mixed categories (containing as well subcategories as leaf node) are not allowed --- checkman/cmctc.temp | 2 +- checkman/cmctc_lcp.blower | 2 +- checkman/cmctc_lcp.blowergrade | 2 +- checkman/cmctc_lcp.flow | 2 +- checkman/cmctc_lcp.regulator | 2 +- checkman/cmctc_lcp.temp | 2 +- checkman/cmctc_psm_m | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checkman/cmctc.temp b/checkman/cmctc.temp index 19e6ad6..6562ef0 100644 --- a/checkman/cmctc.temp +++ b/checkman/cmctc.temp @@ -1,6 +1,6 @@ title: Rittal CMC TC Temperature sensors agents: snmp -catalog: hw/environment/rittal +catalog: hw/environment author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/cmctc_lcp.blower b/checkman/cmctc_lcp.blower index a9f382e..11a91b4 100644 --- a/checkman/cmctc_lcp.blower +++ b/checkman/cmctc_lcp.blower @@ -1,6 +1,6 @@ title: Rittal CMC-TC LCP Blowers agents: snmp -catalog: hw/environment/rittal +catalog: hw/environment author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/cmctc_lcp.blowergrade b/checkman/cmctc_lcp.blowergrade index 8571113..194cf80 100644 --- a/checkman/cmctc_lcp.blowergrade +++ b/checkman/cmctc_lcp.blowergrade @@ -1,6 +1,6 @@ title: Rittal CMC-TC LCP Blower total state agents: snmp -catalog: hw/environment/rittal +catalog: hw/environment author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/cmctc_lcp.flow b/checkman/cmctc_lcp.flow index 109e2e5..b9b5b07 100644 --- a/checkman/cmctc_lcp.flow +++ b/checkman/cmctc_lcp.flow @@ -1,6 +1,6 @@ title: Rittal CMC-TC LCP Water flow agents: snmp -catalog: hw/environment/rittal +catalog: hw/environment author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/cmctc_lcp.regulator b/checkman/cmctc_lcp.regulator index a7bd51e..e34641e 100644 --- a/checkman/cmctc_lcp.regulator +++ b/checkman/cmctc_lcp.regulator @@ -1,6 +1,6 @@ title: Rittal CMC-TC LCP Regulator agents: snmp -catalog: hw/environment/rittal +catalog: hw/environment author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/cmctc_lcp.temp b/checkman/cmctc_lcp.temp index 410b6e8..cd51582 100644 --- a/checkman/cmctc_lcp.temp +++ b/checkman/cmctc_lcp.temp @@ -1,6 +1,6 @@ title: Rittal CMC-TC LCP Temperature sensors agents: snmp -catalog: hw/environment/rittal +catalog: hw/environment author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/cmctc_psm_m b/checkman/cmctc_psm_m index 3000184..90094d2 100644 --- a/checkman/cmctc_psm_m +++ b/checkman/cmctc_psm_m @@ -1,6 +1,6 @@ title: Rittal CMC-TC PSM-M Sensors agents: snmp -catalog: hw/environment/rittal +catalog: hw/environment author: Bastian Kuhn <bk(a)mathias-kettner.de> license: GPL distribution: check_mk

11 years, 2 months

Check_MK Git: check_mk: Updated oracle manpages

by Lars Michelsen

Module: check_mk Branch: master Commit: 10438e8a7cdc212921409a48f83a7918cbe0fb68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10438e8a7cdc21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 1 09:19:28 2013 +0200 Updated oracle manpages --- checkman/oracle_jobs | 2 +- checkman/oracle_logswitches | 2 +- checkman/oracle_rman_backups | 2 +- checkman/oracle_sessions | 2 +- checkman/oracle_tablespaces | 2 +- checkman/oracle_version | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checkman/oracle_jobs b/checkman/oracle_jobs index 5224090..25035dd 100644 --- a/checkman/oracle_jobs +++ b/checkman/oracle_jobs @@ -1,5 +1,5 @@ title: Oracle Database Jobs -agents: linux +agents: linux, solaris, hpux catalog: app/oracle author: Lars Michelsen <lm(a)mathias-kettner.de> license: GPL diff --git a/checkman/oracle_logswitches b/checkman/oracle_logswitches index 71f85c9..e924de5 100644 --- a/checkman/oracle_logswitches +++ b/checkman/oracle_logswitches @@ -1,5 +1,5 @@ title: Log switch activity of ORACLE database -agents: linux, hpux +agents: linux, hpux, windows, solaris catalog: app/oracle author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL diff --git a/checkman/oracle_rman_backups b/checkman/oracle_rman_backups index 5b0df0f..c0fbb34 100644 --- a/checkman/oracle_rman_backups +++ b/checkman/oracle_rman_backups @@ -1,5 +1,5 @@ title: Oracle RMAN Backups -agents: linux +agents: linux, solaris, hpux catalog: app/oracle author: Lars Michelsen <lm(a)mathias-kettner.de> license: GPL diff --git a/checkman/oracle_sessions b/checkman/oracle_sessions index 0342961..11566bb 100644 --- a/checkman/oracle_sessions +++ b/checkman/oracle_sessions @@ -1,5 +1,5 @@ title: Number of active sessions in ORACLE database -agents: linux, hpux +agents: linux, hpux, solaris catalog: app/oracle author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL diff --git a/checkman/oracle_tablespaces b/checkman/oracle_tablespaces index 1d1d1e9..d265f34 100644 --- a/checkman/oracle_tablespaces +++ b/checkman/oracle_tablespaces @@ -1,5 +1,5 @@ title: Various aspects of ORACLE tablespaces -agents: linux, hpux +agents: linux, hpux, solaris, windows catalog: app/oracle author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL diff --git a/checkman/oracle_version b/checkman/oracle_version index 0337e28..c37b353 100644 --- a/checkman/oracle_version +++ b/checkman/oracle_version @@ -1,5 +1,5 @@ title: Version of an ORACLE database checked by login -agents: linux, hpux, windows +agents: linux, hpux, windows, solaris catalog: app/oracle author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: cf56787edb94cf533fc8f391b8e2f68cc16ad1d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf56787edb94cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 1 08:52:34 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: mk_oracle: Added plugin for solaris

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c53c097b75a920af3829e0e7b57ac0fffc86972 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c53c097b75a92… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 1 08:52:30 2013 +0200 mk_oracle: Added plugin for solaris --- ChangeLog | 1 + agents/solaris/mk_oracle | 200 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 201 insertions(+) diff --git a/ChangeLog b/ChangeLog index 46fca92..f289fa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * Special Agent vSphere: support ESX 4.1 (thanks to Mirko Witt) * esx_vsphere_object: make check state configurable * mk_logwatch: support continuation lines with 'A'. Please refer to docu. + * mk_oracle: Added plugin for solaris Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/agents/solaris/mk_oracle b/agents/solaris/mk_oracle new file mode 100644 index 0000000..194fda9 --- /dev/null +++ b/agents/solaris/mk_oracle @@ -0,0 +1,200 @@ +#!/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 ORACLE databases + +# This plugin is a port of the linux agent plugin. It has been +# tested with solaris 10. + +# 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 on this system we've already found a database + if [ -e "$MK_CONFDIR/mk_oracle.found" ] ; then + echo '<<<oracle_version>>>' + echo '<<<oracle_sessions>>>' + echo '<<<oracle_logswitches>>>' + echo '<<<oracle_tablespaces>>>' + fi + exit 0 +fi + +touch $MK_CONFDIR/mk_oracle.found + +# Recreate data if cachefile is older than 120 seconds. +# If you set this to 0, then the cache file will be created +# as often as possible. If the database queries last longer +# then your check interval, caching will be active nevertheless. +CACHE_MAXAGE=120 + +# Source the optional configuration file for this agent plugin +if [ -e "$MK_CONFDIR/mk_oracle.cfg" ] +then + . $MK_CONFDIR/mk_oracle.cfg +fi + +# You can specify a list of SIDs to monitor. Those databases will +# only be handled, if they are found running, though! +# +# ONLY_SIDS="XE HIRN SEPP" +# +# It is possible to filter SIDS negatively. Just add the following to +# the mk_oracle.cfg file: +# +# EXCLUDE_<sid>="ALL" +# +# Another option is to filter single checks for SIDS. Just add +# lines as follows to the mk_oracle.cfg file. One service per +# line: +# +# EXCLUDE_<sid>="<service>" +# +# For example skip oracle_sessions and oracle_logswitches checks +# for the instance "mysid". +# +# EXCLUDE_mysid="sessions logswitches" +# +# +# This check uses a cache file to prevent problems with long running +# SQL queries. It starts building a cache when +# a) no cache is present or the cache is too old and +# b) the cache is not currently being built +# The cache is used for $CACHE_MAXAGE seconds. The CACHE_MAXAGE +# option is pre-set to 120 seconds but can be changed in mk_oracle.cfg. + +function sqlplus () +{ + if OUTPUT=$({ echo 'set pages 0' ; echo 'whenever sqlerror exit 1'; echo 'set lines 8000' ; echo 'set feedback off'; cat ; } | $MK_CONFDIR/sqlplus.sh $1) + then + echo "${OUTPUT}" | sed -e 's/[[:space:]]\+/ /g' -e '/^[[:space:]]*$/d' -e "s/^/$1 /" + else + echo "${OUTPUT}" | sed "s/^/$1 FAILURE /" + fi +} + + +for SID in $SIDS; do + # Check if SID is listed in ONLY_SIDS if this is used + if [ "$ONLY_SIDS" ] ; then + SKIP=yes + for S in $ONLY_SIDS ; do + if [ "$S" = "$SID" ] ; then + SKIP= + break + fi + done + if [ "$SKIP" ] ; then continue ; fi + fi + + EXCLUDE=EXCLUDE_$SID + EXCLUDE=${!EXCLUDE} + # SID filtered totally? + if [ "$EXCLUDE" = "ALL" ]; then + continue + fi + + # Do Version-Check (use as a general login check) without caching + if [ "$EXCLUDE" = "${EXCLUDE/version/}" ]; then + echo '<<<oracle_version>>>' + echo "select banner from v\$version where banner like 'Oracle%';" | sqlplus "$SID" + fi + + CACHE_FILE=$MK_CONFDIR/oracle_$SID.cache + + # Check if file exists and recent enough + CACHE_FILE_UPTODATE= + if [ -s $CACHE_FILE ]; then + NOW=$(perl -le "print time()") + + MTIME=$(perl -MPOSIX -le 'print mktime(localtime((lstat($ARGV[0]))[9]))' $CACHE_FILE) + if [ $(($NOW - $MTIME)) -le $CACHE_MAXAGE ]; then + CACHE_FILE_UPTODATE=1 + fi + 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 + # 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 + # 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 + # to update the information for this instance. + if [ -z "$CACHE_FILE_UPTODATE" -a ! -e "$CACHE_FILE.new" ] + then + nohup bash -c " + set -o noclobber + function sqlplus () + { + if OUTPUT=\$({ echo 'set pages 0' ; echo 'whenever sqlerror exit 1'; echo 'set lines 8000' ; echo 'set feedback off'; cat ; } | $MK_CONFDIR/sqlplus.sh \$1) + then + echo \"\${OUTPUT}\" | sed -e 's/[[:space:]]\+/ /g' -e '/^[[:space:]]*$/d' -e \"s/^/\$1 /\" + else + echo \"\${OUTPUT}\" | sed \"s/^/\$1 FAILURE /\" + fi + } + + { + # Only execute checks when not filtered + if [ '$EXCLUDE' = '${EXCLUDE/sessions/}' ]; then + echo '<<<oracle_sessions>>>' + echo \"select count(1) from v\\\$session where status = 'ACTIVE';\" | sqlplus \"$SID\" + fi + + if [ '$EXCLUDE' = '${EXCLUDE/logswitches/}' ]; then + echo '<<<oracle_logswitches>>>' + echo \"select count(1) from v\\\$loghist where first_time > sysdate - 1/24;\" | sqlplus \"$SID\" + fi + + if [ '$EXCLUDE' = '${EXCLUDE/tablespaces/}' ]; then + echo '<<<oracle_tablespaces>>>' + sqlplus "$SID" <<EOF | sed 's/READ ONLY/READONLY/g' + select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, + f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, + f.ONLINE_STATUS, t.BLOCK_SIZE, t.status, decode(sum(fs.blocks), NULL, 0, + sum(fs.blocks)) free_blocks + from dba_data_files f, dba_tablespaces t, dba_free_space fs + where f.tablespace_name = t.tablespace_name + and f.file_id = fs.file_id(+) + group by f.file_name, f.tablespace_name, f.status, f.autoextensible, + f.blocks, f.maxblocks, f.user_blocks, f.increment_by, f.online_status, + t.block_size, t.status + UNION + select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, + f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', + t.BLOCK_SIZE, t.status, sum(sh.blocks_free) free_blocks + from v\\\$thread th, dba_temp_files f, dba_tablespaces t, v\\\$temp_space_header sh + WHERE f.tablespace_name = t.tablespace_name and f.file_id = sh.file_id + GROUP BY th.instance, f.file_name, f.tablespace_name, f.status, + f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, + 'TEMP', t.block_size, t.status; +EOF + fi + } > $CACHE_FILE.new && mv $CACHE_FILE.new $CACHE_FILE || rm -f $CACHE_FILE* + " + fi +done

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013