Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64359 discussions

Check_MK Git: check_mk: Added Agent for openbsd

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 92f48941902e959c3e278d81f631accd3c980750 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92f48941902e95… Author: Christian Zigotzky <chzigotzky(a)xenosoft.de> Date: Fri Aug 10 10:05:29 2012 +0200 Added Agent for openbsd --- ChangeLog | 1 + agents/check_mk_agent.openbsd | 164 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8796b47..a7569e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * FreeBSD Agent: Added swapinfo call to mem section to make mem check work again * windows_multipath: Added the missing check for multipath.vbs (Please test) * carel_uniflair_cooling: new check for monitoring datacenter air conditioning by "CAREL" + * Added Agent for OpenBSD WATO: * Added permission to control the "clone host" feature in WATO diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd new file mode 100644 index 0000000..366cbd5 --- /dev/null +++ b/agents/check_mk_agent.openbsd @@ -0,0 +1,164 @@ +#!/bin/sh +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +# Author: Lars Michelsen <lm(a)mathias-kettner.de> +# Florian Heigl <florian.heigl(a)gmail.com> +# Christian Zigotzky <chzigotzky(a)xenosoft.de> + +# NOTE: This agent has been adapted from the Check_MK FreeBSD agent. + +# Remove locale settings to eliminate localized outputs where possible +export LC_ALL=C +unset LANG + +export MK_LIBDIR="/usr/lib/check_mk_agent" +export MK_CONFDIR="/etc" + +# Make sure, locally installed binaries are found +PATH=$PATH:/usr/local/bin + +# All executables in PLUGINSDIR will simply be executed and their +# ouput appended to the output of the agent. Plugins define their own +# sections and must output headers with '<<<' and '>>>' +PLUGINSDIR=$MK_LIBDIR/plugins + +# All executables in LOCALDIR will by executabled and their +# output inserted into the section <<<local>>>. Please refer +# to online documentation for details. +LOCALDIR=$MK_LIBDIR/local + + +# close standard input (for security reasons) and stderr +if [ "$1" = -d ] +then + set -xv +else + exec <&- 2>/dev/null +fi + +echo '<<<check_mk>>>' +echo Version: 1.2.0p2 +echo AgentOS: openbsd + +osver="$(uname -r)" + +echo '<<<df>>>' +df -kPt ffs | sed -e 's/^$[^ ][^ ]*$ $.*$$/\1 ffs \2/' | sed 1d + +# processes including username, without kernel processes +echo '<<<ps>>>' +COLUMNS=10000 +ps ax -o user,vsz,rss,pcpu,command | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4) /' + +echo '<<<cpu>>>' +echo `sysctl -n vm.loadavg | tr -d '{}'` `top -b -n 1 | grep -E '^[0-9]+ processes' | awk '{print $3"/"$1}'` `sysctl -n hw.ncpu` + +echo '<<<uptime>>>' +echo `date +%s` - `sysctl -n kern.boottime | cut -d' ' -f 4,7 | tr ',' '.' | tr -d ' '` | bc + +echo '<<<netctr>>>' +# BI= Bytes in +# PI= Packets in +# EI= Errors in +# EO= Errors out +# BO= Bytes out +# PO= Packets out +# CO= Colls + +Z1=1 +Z2=p + +date +%s +while [ $Z1 -lt 15 ] + do + BI=$( netstat -inb | egrep -v Name | grep Link | awk '{print $1" "$5}' | sed -ne $Z1$Z2 ) + PI=$( netstat -in | egrep -v Name | grep Link | awk '{print $5}' | sed -ne $Z1$Z2 ) + EI=$( netstat -in | egrep -v Name | grep Link | awk '{print $6}' | sed -ne $Z1$Z2 ) + FF1="0 0 0 0 0" + BO=$( netstat -inb | egrep -v Name | grep Link | awk '{print $6}' | sed -ne $Z1$Z2 ) + PO=$( netstat -in | egrep -v Name | grep Link | awk '{print $7}' | sed -ne $Z1$Z2 ) + EO=$( netstat -in | egrep -v Name | grep Link | awk '{print $8}' | sed -ne $Z1$Z2 ) + CO=$( netstat -in | egrep -v Name | grep Link | awk '{print $9}' | sed -ne $Z1$Z2 ) + FF2="0 0" + if [ "$PI" -gt "0" ] + then + echo $BI $PI $EI $FF1 $BO $PO $EO $FF2 $CO $FF2 + fi + Z1=$(($Z1+1)) +done + +# IPMI-Data (Fans, CPU, temperature, etc) +# needs the sysutils/ipmitool and kldload ipmi.ko +if which ipmitool >/dev/null ; then + echo '<<<ipmi>>>' + ipmitool sensor list \ + | grep -v 'command failed' \ + | sed -e 's/ *| */|/g' -e "s/ /_/g" -e 's/_*$//' -e 's/|/ /g' \ + | egrep -v '^[^ ]+ na ' \ + | grep -v ' discrete ' +fi + +if which mailq >/dev/null 2>&1 && getent passwd postfix >/dev/null 2>&1; then + echo '<<<postfix_mailq>>>' + mailq | tail -n 6 +fi + + +# Einbinden von lokalen Plugins, die eine eigene Sektion ausgeben +if cd $PLUGINSDIR +then + for skript in $(ls) + do + if [ -x "$skript" ] ; then + ./$skript + fi + done +fi + +# Lokale Einzelchecks +echo '<<<local>>>' +if cd $LOCALDIR +then + for skript in $(ls) + do + if [ -x "$skript" ] ; then + ./$skript + fi + done +fi + +# MK's Remote Plugin Executor +if [ -e "$MK_CONFDIR/mrpe.cfg" ] +then + echo '<<<mrpe>>>' + grep -Ev '^[[:space:]]*($|#)' "$MK_CONFDIR/mrpe.cfg" | \ + while read descr cmdline + do + PLUGIN=${cmdline%% *} + OUTPUT=$(eval "$cmdline") + echo -n "(${PLUGIN##*/}) $descr $? $OUTPUT" | tr \\n \\1 + echo + done +fi

12 years, 1 month

Check_MK Git: check_mk: Fixed get_url_sync

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 057a3bf5401d62827ddb715f5407a4fa3497ccf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=057a3bf5401d62… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Aug 9 12:10:33 2012 +0200 Fixed get_url_sync --- web/htdocs/js/checkmk.js | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 1a37e37..83bb22f 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -161,14 +161,9 @@ function get_url_sync(url) { var AJAX = new ActiveXObject("Microsoft.XMLHTTP"); } - try - { - AJAX.open("GET", url, false); - AJAX.send(null); - return AJAX.responseText; - } catch(err) { - return false; - } + AJAX.open("GET", url, false); + AJAX.send(null); + return AJAX.responseText; }

12 years, 1 month

Check_MK Git: check_mk: Catch error in get_url_sync function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 47aa2e3c60f605bab16b8b04d90cd387b8d0a520 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47aa2e3c60f605… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Aug 9 11:50:34 2012 +0200 Catch error in get_url_sync function --- web/htdocs/js/checkmk.js | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index e7e63d8..1a37e37 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -161,9 +161,14 @@ function get_url_sync(url) { var AJAX = new ActiveXObject("Microsoft.XMLHTTP"); } - AJAX.open("GET", url, false); - AJAX.send(null); - return AJAX.responseText; + try + { + AJAX.open("GET", url, false); + AJAX.send(null); + return AJAX.responseText; + } catch(err) { + return false; + } }

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0737

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 650d335f345fd70870d3728079514b8be9d0182d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=650d335f345fd7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 8 13:27:56 2012 +0200 Updated bug entries #0737 --- .bugs/737 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/737 b/.bugs/737 new file mode 100644 index 0000000..01c6a8c --- /dev/null +++ b/.bugs/737 @@ -0,0 +1,11 @@ +Title: Get Services, comments with info always empty +Component: livestatus +State: open +Date: 2012-08-08 12:00:25 +Targetversion: future +Class: bug + +GET servicesbyhostgroup\nColumns: host_name comments_with_info\n +ony retruns hostname, the comments with info are always empty. + +Refernce in Ticket System: #608092

12 years, 1 month

Check_MK Git: check_mk: Wato: Fixed handling of regex in check_http

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cc9c34e297a0bd448b4ecb74c534f20ed257cc67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc9c34e297a0bd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 8 11:53:10 2012 +0200 Wato: Fixed handling of regex in check_http --- checks/check_http | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/checks/check_http b/checks/check_http index e96812c..46bfbb5 100644 --- a/checks/check_http +++ b/checks/check_http @@ -83,6 +83,13 @@ def check_http_arguments(params): if "expect_string" in settings: args += ' -s %s' % quote_shell_string(settings["expect_string"]) + if "expect_regex" in settings: + args += ' -r %s' % quote_shell_string(settings['expect_regex'][0]) + if settings['expect_regex'][1]: + args += ' -R' + if settings['expect_regex'][2]: + args += ' --invert-regex' + if "post_data" in settings: data, content_type = settings["post_data"] args += ' -P %s -T %s' % \

12 years, 1 month

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 10b3a9eaefc4f6bfdd9bd87914ba243aba95f85e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10b3a9eaefc4f6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 8 11:34:11 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0736, #0733, #0734, #0735

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cdd4c2efd50bd25c66cd2cbfdffb57b6d14ff9cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdd4c2efd50bd2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 8 11:33:58 2012 +0200 Updated bug entries #0736, #0733, #0734, #0735 --- .bugs/733 | 9 +++++++++ .bugs/734 | 45 +++++++++++++++++++++++++++++++++++++++++++++ .bugs/735 | 10 ++++++++++ .bugs/736 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 0 deletions(-) diff --git a/.bugs/733 b/.bugs/733 new file mode 100644 index 0000000..09f290a --- /dev/null +++ b/.bugs/733 @@ -0,0 +1,9 @@ +Title: Turnoff context in logwatch +Component: checks +State: open +Date: 2012-08-06 16:02:17 +Targetversion: future +Class: feature + +It should be possible to turn the saving of context logentries from logwatch off. +In some cases are there hunderts of not needed entries and the 500kb limit are full with only one error line diff --git a/.bugs/734 b/.bugs/734 new file mode 100644 index 0000000..a61c8a9 --- /dev/null +++ b/.bugs/734 @@ -0,0 +1,45 @@ +Title: Logwatch, logfile names with date +Component: checks +State: open +Date: 2012-08-08 11:15:14 +Targetversion: future +Class: feature + +We have a requirement from our developers to monitor log files in the format: /path/logfile.20120719 with the date changing every day. +To do this, we added code to the parse and change the name in the config file: + +# cat /etc/check_mk/logwatch.cfg +/var/log/test.DATE +C test + +Now to interpret it, we changed the mk_logwatch + +[root@temolate2 ~]# diff mk_logwatch.newest /usr/lib/check_mk_agent/plugins/mk_logwatch +30,35d29 +< from datetime import date +< dd=date.today().strftime("%Y%m%d") +< yyear = date.today().strftime("%Y") +< year = date.today().strftime("%y") +< month = date.today().strftime("%m") +< day = date.today().strftime("%d") +278,284d270 +< gsave = glob +< glob=glob.replace('DATE',dd) +< glob=glob.replace('YYYY',yyear) +< glob=glob.replace('YY',year) +< glob=glob.replace('MM',month) +< glob=glob.replace('DD',day) +< +294c280 +< process_logfile(logfile, patterns, gsave) +--- +> process_logfile(logfile, patterns) + +Could you please add this feature to the next version of the logwatch plugin. + +Thanks! + +Best Regards, + +Roman Lazarev +Information Technology Division diff --git a/.bugs/735 b/.bugs/735 new file mode 100644 index 0000000..2ca4f76 --- /dev/null +++ b/.bugs/735 @@ -0,0 +1,10 @@ +Title: Notes field for Activate Changes in Wato +Component: wato +State: open +Date: 2012-08-08 11:18:29 +Targetversion: future +Class: feature + +* Add a notes field associated with an activate changes (auditing) - we would like to be able to say such and such a change was related to our ticketing system ticket xxxx, for instance + +o Optional - make it a choice to make the field required diff --git a/.bugs/736 b/.bugs/736 new file mode 100644 index 0000000..f575c61 --- /dev/null +++ b/.bugs/736 @@ -0,0 +1,46 @@ +Title: Livechecks goes zoombie +Component: livecheck +State: open +Date: 2012-08-08 11:32:12 +Targetversion: future +Class: bug + +Have been using livecheck and came across this rather nasty bug. We +use livecheck for a whole bunch of http checks (check_http) and after +a while, one of the checks will "hang" and the livecheck process +becomes a "Zombie" process. + +# ps faux +nagios 10880 12.4 2.0 573000 12380 ? Ssl 12:16 16:19 +/usr/bin/nagios -d /etc/nagios/nagios.cfg +nagios 10889 0.0 0.1 11848 1036 ? S 12:16 0:00 \_ +livecheck /var/spool/nagios/checkresults 30 60 +nagios 4100 0.0 0.0 0 0 ? Z 13:44 0:00 | +\_ [livecheck] +nagios 4120 0.0 0.5 138664 3504 ? S 13:44 0:01 +/usr/lib64/nagios/plugins/check_http -H xxx -t 15 -f follow -S + +# strace -p 10880 +Process 10880 attached - interrupt to quit +read(15, + +# strace -p 10889 +Process 10889 attached - interrupt to quit +read(4, + +# strace -p 4120 +Process 4120 attached - interrupt to quit +futex(0x7f996e8bde80, FUTEX_WAIT_PRIVATE, 2, NULL + +Nagios completely stops doing anything, when you kill the check_http +process, Nagios comes back to life: + +nagios.log: +[1343918059] Warning: A system time change of 0d 0h 47m 11s (forwards +in time) has been detected. Compensating... + + + + + +Reference in Ticket System: #110644

12 years, 1 month

Check_MK Git: check_mk: Multisite: Handling plain_error parameter also on page not found errors

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59458a730643a14927961b2af2a45870a3b1834d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59458a730643a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 7 09:58:33 2012 +0200 Multisite: Handling plain_error parameter also on page not found errors --- web/htdocs/index.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index ccd09e5..c5e5377 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -409,6 +409,9 @@ def handler(req, profiling = True): return response_code def page_not_found(): - html.header(_("Page not found")) - html.show_error(_("This page was not found. Sorry.")) + if html.has_var("_plain_error"): + html.write(_("Page not found")) + else: + html.header(_("Page not found")) + html.show_error(_("This page was not found. Sorry.")) html.footer()

12 years, 1 month

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9e44e3b052625d9b4b350838d4c1585900c3b366 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e44e3b052625d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 7 09:58:37 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 1 month

Check_MK Git: check_mk: Added helper function for custom host var painters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4a9e0423430429b88780d00d013f6fca006e5b71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a9e0423430429… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 6 15:15:56 2012 +0200 Added helper function for custom host var painters --- web/plugins/views/painters.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index c789e38..9bce496 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -103,6 +103,16 @@ multisite_painter_options["ts_date"] = { ("%m/%d", "12/18") ] } +# This helper function returns the value of the given custom var +def paint_custom_host_var(what, row): + custom_vars = dict(zip(row["host_custom_variable_names"], + row["host_custom_variable_values"])) + + if what in custom_vars: + return what, custom_vars[what] + return what, "" + + # ___ # |_ _|___ ___ _ __ ___ # | |/ __/ _ \| '_ \/ __| @@ -145,7 +155,6 @@ def paint_icons(what, row): return "icons", output - def iconpainter_columns(what): cols = set(['site', 'host_name',

12 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits