Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: FIX: Fixed commands in host/service search views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3f331e4797bcc47430399cbc0e0993069d7d6bef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f331e4797bcc4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 2 12:25:31 2012 +0200 FIX: Fixed commands in host/service search views --- ChangeLog | 1 + web/htdocs/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9876b89..a4f3e94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * New view setting for page header: repeat. This repeats the column headers every 20'th row. * FIX: Fixed problem with new eval/pickle + * FIX: Fixed commands in host/service search views Checks & Agents: * FIX: Made logwatch parsing mechanism a little more robust diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f139fa8..7ba8eac 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1273,7 +1273,7 @@ def show_view(view, show_heading = False, show_buttons = True, painter_options.sort() # Fetch data. Some views show data only after pressing [Search] - if (only_count or (not view["mustsearch"]) or html.var("filled_in") == "filter"): + if (only_count or (not view["mustsearch"]) or html.var("filled_in") in ["filter", 'actions', 'confirm']): # names for additional columns (through Stats: headers) add_columns = datasource.get("add_columns", [])

12 years, 1 month

Check_MK Git: check_mk: WATO: configure check_http

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1cbff300204b051b323128296b9e9b493358356b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cbff300204b05… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 1 21:54:10 2012 +0200 WATO: configure check_http --- checks/check_http | 106 +++++++++++++++++++++++++++++++ pnp-templates/check_mk_active-http.php | 30 +++++++++ pnp-templates/check_mk_active-tcp.php | 1 - web/htdocs/valuespec.py | 6 +- web/plugins/perfometer/active_checks.py | 8 +++ web/plugins/wato/active_checks.py | 11 ++- 6 files changed, 154 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1cbff30020…

12 years, 1 month

Check_MK Git: check_mk: Added file headers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3974d2cd149427252366d316c02edf8c06783f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3974d2cd14942… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 1 21:56:30 2012 +0200 Added file headers --- pnp-templates/check_mk_active-http.php | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/pnp-templates/check_mk_active-http.php b/pnp-templates/check_mk_active-http.php index 18ab677..7e4048c 100644 --- a/pnp-templates/check_mk_active-http.php +++ b/pnp-templates/check_mk_active-http.php @@ -1,4 +1,28 @@ <?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + $desc = str_replace("_", " ", $servicedesc); $opt[1] = "-X0 --vertical-label \"Response Time (ms)\" --title \"$hostname / $desc\" ";

12 years, 1 month

Check_MK Git: check_mk: check_http formalized, argument creation still missing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3381a0bae7c7ea489097f54179e0b6155a1cbd45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3381a0bae7c7ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 1 16:18:22 2012 +0200 check_http formalized, argument creation still missing --- web/htdocs/check_mk.css | 2 +- web/htdocs/htmllib.py | 6 + web/htdocs/js/checkmk.js | 2 + web/htdocs/valuespec.py | 22 ++-- web/plugins/wato/active_checks.py | 227 ++++++++++++++++++++++++++++++++++++- 5 files changed, 246 insertions(+), 13 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3381a0bae7…

12 years, 1 month

Check_MK Git: check_mk: Added missing file headers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0943673db052e747a6c9907409e89417dc5f8fb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0943673db052e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 1 12:17:09 2012 +0200 Added missing file headers --- checks/check_tcp | 31 ++++++++-- doc/helpers/headrify | 3 +- doc/opt/benchmark/cmkbench.sh | 23 +++++++ doc/treasures/livestatus-to-nsca.sh | 102 +++++++++++++++--------------- pnp-templates/check_mk_active-tcp.php | 23 +++++++ web/plugins/perfometer/active_checks.py | 26 ++++++++ web/plugins/wato/active_checks.py | 26 ++++++++ 7 files changed, 176 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0943673db0…

12 years, 1 month

Check_MK Git: check_mk: headrify: leave alone jquery

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b26cdcd0ea1e8b3818b522f71243ea5c4b7ec8d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b26cdcd0ea1e8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 1 12:19:14 2012 +0200 headrify: leave alone jquery --- doc/helpers/headrify | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index b6b485d..369cad7 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -97,11 +97,10 @@ if [ "$#" -gt 0 ] ; then headrify "$file" done else - { find -not -type l -and $ \ + { find -not -type l -and -not -name "jquery*" -and \( \ -name "Makefile" -or \ -name "Makefile.am" -or \ -name "configure.ac" -or \ - -name "jquery.*" -or \ -name "*.in" -or \ -name "*.h" -or \ -name "*.cc" -or \ @@ -111,7 +110,7 @@ else -name "*.php" -or \ -name "*.sh" -or \ -name "*.spec" $ ; \ - rm -f checks/*~ ; ls checks/* ; echo agents/plugins/* agents/* | tr ' ' \\n | grep -vx agents/waitmax | fgrep -v /hpux/ | fgrep -v windows | fgrep -v .exe | fgrep -v /plugins | fgrep -v .hpux ; ls agents/windows/*.cc ; echo agents/windows/Makefile ; } \ + rm -f checks/*~ ; ls checks/* ; echo agents/plugins/* agents/* | tr ' ' \\n | grep -vx agents/waitmax | fgrep -v hpux/ | fgrep -v windows | fgrep -v .exe | fgrep -v /plugins | fgrep -v .hpux ; ls agents/windows/*.cc ; echo agents/windows/Makefile ; } \ | grep -v /Privat/ | grep -v livestatus/nagios/ | grep -vx '' | \ while read file do

12 years, 1 month

Check_MK Git: check_mk: Fix headrification for /usr/bin/bash files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 16d40842fffc09a8c733793ee22929c49aded883 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16d40842fffc09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 1 12:11:02 2012 +0200 Fix headrification for /usr/bin/bash files --- doc/helpers/headrify | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index 4690902..bfb3e3d 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -51,6 +51,9 @@ headrify () elif [ "${headline:0:11}" = "#!/bin/bash" ] ; then comment="# " bangpath="#!/bin/bash" + elif [ "${headline:0:15}" = "#!/usr/bin/bash" ] ; then + comment="# " + bangpath="#!/usr/bin/bash" else bangpath="" case "${file##*/}" in

12 years, 1 month

Check_MK Git: check_mk: Finally fixed make headers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 38fb0d2d17f569d1b13cb949f203c459c6ad4d5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38fb0d2d17f569… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 1 12:20:50 2012 +0200 Finally fixed make headers --- doc/helpers/headrify | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index 369cad7..7c2f630 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -110,7 +110,7 @@ else -name "*.php" -or \ -name "*.sh" -or \ -name "*.spec" \) ; \ - rm -f checks/*~ ; ls checks/* ; echo agents/plugins/* agents/* | tr ' ' \\n | grep -vx agents/waitmax | fgrep -v hpux/ | fgrep -v windows | fgrep -v .exe | fgrep -v /plugins | fgrep -v .hpux ; ls agents/windows/*.cc ; echo agents/windows/Makefile ; } \ + rm -f checks/*~ ; ls checks/* ; echo agents/plugins/* agents/* | tr ' ' \\n | grep -vx agents/waitmax | fgrep -v agents/hpux | fgrep -v windows | fgrep -v .exe | fgrep -v /plugins | fgrep -v .hpux ; ls agents/windows/*.cc ; echo agents/windows/Makefile ; } \ | grep -v /Privat/ | grep -v livestatus/nagios/ | grep -vx '' | \ while read file do

12 years, 1 month

Check_MK Git: check_mk: PNP-Template and Perf-O-Meter for check_tcp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c2fb55248ec5ef76b39b9ce2b8a6c87febe9b553 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2fb55248ec5ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 1 12:07:46 2012 +0200 PNP-Template and Perf-O-Meter for check_tcp --- pnp-templates/check_mk_active-tcp.php | 16 ++++++++++++++++ web/plugins/perfometer/active_checks.py | 10 ++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/pnp-templates/check_mk_active-tcp.php b/pnp-templates/check_mk_active-tcp.php new file mode 100644 index 0000000..e46b3e2 --- /dev/null +++ b/pnp-templates/check_mk_active-tcp.php @@ -0,0 +1,16 @@ +<?php + +$desc = str_replace("_", " ", $servicedesc); + +$opt[1] = "-X0 --vertical-label \"Response Time (ms)\" --title \"$hostname / $desc\" "; + + +$def[1] = "" + . "DEF:var1=$RRDFILE[1]:$DS[1]:MAX " + . "CDEF:ms=var1,1000,* " + . "AREA:ms#20dd30:\"Response Time \" " + . "LINE1:ms#000000:\"\" " + . "GPRINT:ms:LAST:\"%3.3lg ms LAST \" " + . "GPRINT:ms:MAX:\"%3.3lg ms MAX \" " + . "GPRINT:ms:AVERAGE:\"%3.3lg ms AVERAGE \" " +?> diff --git a/web/plugins/perfometer/active_checks.py b/web/plugins/perfometer/active_checks.py new file mode 100644 index 0000000..67d39b6 --- /dev/null +++ b/web/plugins/perfometer/active_checks.py @@ -0,0 +1,10 @@ + +def perfometer_check_tcp(row, check_command, perfdata): + time_ms = float(perfdata[0][1]) * 1000.0 + return "%.3f ms" % time_ms, \ + perfometer_logarithmic(time_ms, 1000, 10, "#20dd30") + +perfometers["check-tcp"] = perfometer_check_tcp +perfometers["check_tcp"] = perfometer_check_tcp +perfometers["check_mk_active-tcp"] = perfometer_check_tcp +

12 years, 1 month

Check_MK Git: check_mk: Formalization of check_tcp finished

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5cfdf11f0c4c6aa8dea7d279877b58e106606793 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cfdf11f0c4c6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 1 11:54:26 2012 +0200 Formalization of check_tcp finished --- ChangeLog | 1 + checks/check_tcp | 42 +++++++++++++++++- web/htdocs/valuespec.py | 2 +- web/plugins/wato/active_checks.py | 85 ++++++++++++++++++++++++++++--------- 4 files changed, 106 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67e8b26..9876b89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * You can configure parents now (via a host attribute, no rules are neccessary). * You can now do an automated scan for parents and layer 3 (IP) + * You can configure active checks (check_tcp, ...) via WATO now * FIX: fix page header after confirmation dialogs * FIX: Fixed umlaut problem in host aliases and ip addresses created by WATO * FIX: Fixed exception caused by validation problems during editing tags in WATO diff --git a/checks/check_tcp b/checks/check_tcp index b3b2fd9..e1e13cc 100644 --- a/checks/check_tcp +++ b/checks/check_tcp @@ -8,18 +8,56 @@ def check_tcp_arguments(params): port, settings = params args = ' -p %d' % port + if "response_time" in settings: args += ' -w %f -c %f' % ( settings["response_time"][0]/1000.0, settings["response_time"][1]/1000.0) - if settings.get("escape_send_string"): - args += ' --escape' + + if "timeout" in settings: + args += ' -t %d' % settings["timeout"] + + if "refuse_state" in settings: + args += ' -r %s' % settings["refuse_state"] + if "send_string" in settings: args += ' -s %s' % quote_shell_string(settings["send_string"]) + if settings.get("escape_send_string"): + args += ' --escape' + + if "expect" in settings: + for s in settings["expect"]: + args += ' -e %s' % quote_shell_string(s) + + if settings.get("expect_all"): + args += ' -A' + + if settings.get("jail"): + args += ' --jail' + + if "mismatch_state" in settings: + args += ' -M %s' % settings["mismatch_state"] + + if "delay" in settings: + args += ' -d %d' % settings["delay"] + + if "maxbytes" in settings: + args += ' -m %d' % settings["maxbytes"] + + if settings.get("ssl"): + args += ' --ssl' + + if "cert_days" in settings: + args += ' -D %d' % settings["cert_days"] + + if "quit_string" in settings: + args += ' -q %s' % quote_shell_string(settings["quit_string"]) return args + + active_check_info['tcp'] = { "command_line" : '$USER1$/check_tcp -H $HOSTADDRESS$ $ARG1$', "argument_function" : check_tcp_arguments, diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1df71f6..74cbba8 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1471,7 +1471,7 @@ class Dictionary(ValueSpec): div_id, not visible and "none" or "")) if self._columns == 1 and vs.help(): html.write("<ul class=help>%s</ul>" % vs.help()) - vs.render_input(vp, value.get(param, vs.canonical_value())) + vs.render_input(vp, value.get(param, vs.default_value())) html.write("</div></td></tr>") html.write("</table>") diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index f52997d..3e1d6de 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -19,10 +19,23 @@ register_rule(group, Tuple( title = _("Expected response time"), elements = [ - Float(title = _("Warning at"), unit = "ms"), - Float(title = _("Critical at"), unit = "ms"), + Float( + title = _("Warning at"), + unit = "ms", + default_value = 100.0), + Float( + title = _("Critical at"), + unit = "ms", + default_value = 200.0), ]) ), + ( "timeout", + Integer( + title = _("Seconds before connection times out"), + label = _("sec"), + default_value = 10, + ) + ), ( "refuse_state", DropdownChoice( title = _("State for connection refusal"), @@ -31,19 +44,6 @@ register_rule(group, ('ok', _("OK")), ]) ), -# Das hier fehlt noch: -# -m, --maxbytes=INTEGER -# Close connection once more than this number of bytes are received -# -d, --delay=INTEGER -# Seconds to wait between sending string and polling for response -# -D, --certificate=INTEGER -# Minimum number of days a certificate has to be valid. -# -S, --ssl -# Use SSL for the connection. -# -t, --timeout=INTEGER -# Seconds before connection times out (default: 10) -# Und dann fehlt noch bei den meisten die Umseztung in Parameter - ( "send_string", TextAscii( @@ -69,12 +69,14 @@ register_rule(group, totext = _("expect all"), title = _("Expect <b>all</b> of those strings in the response")) ), - ( "quit_string", - TextAscii( - title = _("Final string to send"), - help = _("String to send server to initiate a clean close of " - "the connection"), - size = 30) + ( "jail", + FixedValue( + value = True, + title = _("Hide response from socket"), + help = _("As soon as you configure expected strings in " + "the response the check will output the response - " + "as long as you do not hide it with this option"), + totext = _("hide response")) ), ( "mismatch_state", DropdownChoice( @@ -84,6 +86,47 @@ register_rule(group, ('ok', _("OK")), ]) ), + ( "delay", + Integer( + title = _("Seconds to wait before polling"), + help = _("Seconds to wait between sending string and polling for response"), + label = _("sec"), + default_value = 0, + ) + ), + ( "maxbytes", + Integer( + title = _("Maximum number of bytes to receive"), + help = _("Close connection once more than this number of " + "bytes are received. Per default the number of " + "read bytes is not limited. This setting is only " + "used if you expect strings in the response."), + default_value = 1024, + ), + ), + + ( "ssl", + FixedValue( + value = True, + totext = _("use SSL"), + title = _("Use SSL for the connection.")) + + ), + ( "cert_days", + Integer( + title = _("SSL certificate validation"), + help = _("Minimum number of days a certificate has to be valid"), + label = _("days"), + default_value = 30) + ), + + ( "quit_string", + TextAscii( + title = _("Final string to send"), + help = _("String to send server to initiate a clean close of " + "the connection"), + size = 30) + ), ]), ] ),

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 May 2012