Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

Check_MK Git: check_mk: windows agent: some fixes with possible script buffer overflows

by Andreas Boesl

Module: check_mk Branch: master Commit: bbcd81eb28ec3dcab8100ae7efac504698247d7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbcd81eb28ec3d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 16:43:59 2013 +0200 windows agent: some fixes with possible script buffer overflows --- agents/windows/check_mk_agent-64.exe | Bin 178688 -> 178688 bytes agents/windows/check_mk_agent.cc | 9 ++++++--- agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/install_agent-64.exe | Bin 148906 -> 148888 bytes agents/windows/install_agent.exe | Bin 146421 -> 146432 bytes 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index e8a9f86..33cc7da 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d419e02..efeeaf6 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -103,11 +103,11 @@ // Maximum heap buffer for a single local/plugin script // This buffer contains the check output -#define SCRIPT_BUFFER_HEAP 65536 +#define SCRIPT_BUFFER_HEAP 524288 // Maximum timeout for a single local/plugin script #define DEFAULT_PLUGIN_TIMEOUT 60 -#define DEFAULT_LOCAL_TIMEOUT 60 +#define DEFAULT_LOCAL_TIMEOUT 60 // Check compilation environment 32/64 bit #if _WIN32 || _WIN64 @@ -2289,6 +2289,9 @@ int launch_program(script_container* cont) } } + if (out_offset >= SCRIPT_BUFFER_HEAP) + break; + if (exit != STILL_ACTIVE) break; @@ -2309,7 +2312,7 @@ int launch_program(script_container* cont) DWORD WINAPI ScriptWorkerThread(LPVOID lpParam) { script_container* cont = (script_container*) lpParam; - cont->buffer_work = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SCRIPT_BUFFER_HEAP); + cont->buffer_work = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SCRIPT_BUFFER_HEAP + 1); // Execute script int result = launch_program(cont); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ee73ef2..f8a42ac 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 34093dd..802e583 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6865768..6623c5b 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

10 years, 11 months

Check_MK Git: check_mk: windows agent: cache_age parameter also applies when async/sync caching is disabled

by Andreas Boesl

Module: check_mk Branch: master Commit: c24e7078bf2b14457127e14b8f1383d7de18798f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c24e7078bf2b14… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 16:34:44 2013 +0200 windows agent: cache_age parameter also applies when async/sync caching is disabled --- agents/windows/check_mk_agent-64.exe | Bin 178688 -> 178688 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 148924 -> 148906 bytes agents/windows/install_agent.exe | Bin 146405 -> 146421 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 7 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 0b4e707..e8a9f86 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4c9fda2..d419e02 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2380,7 +2380,7 @@ void run_external_programs(char *dirname, script_type type, bool dry_run = false cont->should_terminate = 0; cont->timeout = get_script_timeout(name, type); cont->max_retries = get_script_max_retries(name, type); - cont->max_age = g_caching_method == CACHE_OFF ? 0 : get_script_cache_age(name, type); + cont->max_age = get_script_cache_age(name, type); cont->status = SCRIPT_IDLE; cont->last_problem = SCRIPT_NONE; script_containers[cont->path] = cont; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 86fc5cd..ee73ef2 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 1b7e962..656ef00 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e55d5fa..34093dd 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index b71b869..6865768 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index f1e64ac..3c18eb6 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

10 years, 11 months

Check_MK Git: check_mk: removed useless code

by Andreas Boesl

Module: check_mk Branch: master Commit: 14e73d2ab812262c4791d2ed0d9bc8a92dfdda5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14e73d2ab81226… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 12:41:35 2013 +0200 removed useless code --- checks/win_netstat | 5 ----- 1 file changed, 5 deletions(-) diff --git a/checks/win_netstat b/checks/win_netstat index 4b221f6..1f03b39 100644 --- a/checks/win_netstat +++ b/checks/win_netstat @@ -59,11 +59,6 @@ win_netstat_states = { "WARTEND" : "TIME_WAIT", # Add further states in any required language here. Sorry, Windows # has no "unset LANG" ;-) - - # English - "LISTENING" : "LISTENING", - "ESTABLISHED" : "ESTABLISHED", - "TIME_WAIT" : "TIME_WAIT", }

10 years, 11 months

Check_MK Git: check_mk: win_netstat: new checkgroup params min_states/ max_states. add english language for basic states

by Andreas Boesl

Module: check_mk Branch: master Commit: c6b94e02bd2d3cc6b0306e8a68b9567355b8c425 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6b94e02bd2d3c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 11:48:41 2013 +0200 win_netstat: new checkgroup params min_states/max_states. add english language for basic states --- checkman/win_netstat | 9 +++++++-- checks/win_netstat | 37 +++++++++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 19 +++++++++++++++++ 3 files changed, 58 insertions(+), 7 deletions(-) diff --git a/checkman/win_netstat b/checkman/win_netstat index 3c1f0ab..f49a580 100644 --- a/checkman/win_netstat +++ b/checkman/win_netstat @@ -66,7 +66,12 @@ parameters (dict): A dictionary with the following keys, all of which are {"proto"} {TCP} or {UDP} are possible values: The protocol used for the connection or the listener. - {"state"} {"ESTABLISHED"}, {"LISTEN"}, {"TIME_WAIT"}, {"SYN_SENT"}, {"SYN_RECV"}, + {"state"} {"ESTABLISHED"}, {"LISTENING"}, {"TIME_WAIT"}, {"SYN_SENT"}, {"SYN_RECV"}, {"LAST_ACK"}, {"CLOSE_WAIT"}, {"TIME_WAIT"}, {"CLOSED"}, {"CLOSING"}, {"FIN_WAIT1"}, {"FIN_WAIT2"}, or {"BOUND"}: The expected state of the TCP/UDP socket. You most probably will use either - {"ESTABLISHED"} or {"LISTEN"}. + {"ESTABLISHED"} or {"LISTENING"}. + + {"min_states"} Tuple(warn, crit) The minimum allowed entries of the required state + + {"min_states"} Tuple(warn, crit) The maximum allowed entries of the required state + diff --git a/checks/win_netstat b/checks/win_netstat index 5cdba4a..4b221f6 100644 --- a/checks/win_netstat +++ b/checks/win_netstat @@ -53,11 +53,17 @@ # UDP 127.0.0.1:1900 *:* win_netstat_states = { - "ABH\x99REN" : "LISTEN", + # German + "ABH\x99REN" : "LISTENING", "HERGESTELLT" : "ESTABLISHED", "WARTEND" : "TIME_WAIT", # Add further states in any required language here. Sorry, Windows # has no "unset LANG" ;-) + + # English + "LISTENING" : "LISTENING", + "ESTABLISHED" : "ESTABLISHED", + "TIME_WAIT" : "TIME_WAIT", } @@ -105,11 +111,32 @@ def check_win_netstat(item, params, info): if match: found += 1 - if found: - state = 0 - else: + # Check if found connections are within limits + state = 0 + extra_info = "" + + if params["min_states"]: + min_warn, min_crit = params["min_states"] + if found <= min_crit: + state = max(state, 2) + extra_info += '(!!) Minimum at %d ' % min_crit + elif found <= min_warn: + state = max(state, 1) + extra_info += '(!) Minimum at %d ' % min_warn + + if params["max_states"]: + max_warn, max_crit = params["max_states"] + if found >= max_crit: + state = max(state, 2) + extra_info += '(!!) Maximum at %d ' % max_crit + elif found >= max_warn: + state = max(state, 1) + extra_info += '(!) Maximum at %d ' % max_warn + + if not found: state = 2 - return state, "Found %d matching entries" % found + + return state, "Found %d matching entries %s" % (found, extra_info) check_info["win_netstat"] = { 'check_function' : check_win_netstat, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1381579..93084e8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1184,6 +1184,7 @@ register_check_parameters( title = _("State"), choices = [ ( "ESTABLISHED", "ESTABLISHED" ), + ( "LISTENING", "LISTENING" ), ( "SYN_SENT", "SYN_SENT" ), ( "SYN_RECV", "SYN_RECV" ), ( "LAST_ACK", "LAST_ACK" ), @@ -1201,6 +1202,24 @@ register_check_parameters( ( "local_port", Integer(title = _("Local port number"), minvalue = 1, maxvalue = 65535, )), ( "remote_ip", IPv4Address(title = _("Remote IP address"))), ( "remote_port", Integer(title = _("Remote port number"), minvalue = 1, maxvalue = 65535, )), + ( "min_states", + Tuple( + title = _("Number of minimum connections or listeners"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + ), + ), + ( "max_states", + Tuple( + title = _("Number of maximum connections or listeners"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + ), + ), ] ), TextAscii(title = _("Connection name"), help = _("Specify an arbitrary name of this connection here"), allow_empty = False),

10 years, 11 months

Check_MK Git: check_mk: win_netstat: correct splitting of ipv6 adresses

by Andreas Boesl

Module: check_mk Branch: master Commit: 0ed906479e9d533c5da82b947fe0be8fdfe59fc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ed906479e9d53… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 11:16:05 2013 +0200 win_netstat: correct splitting of ipv6 adresses --- checks/win_netstat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/win_netstat b/checks/win_netstat index 76876c2..5cdba4a 100644 --- a/checks/win_netstat +++ b/checks/win_netstat @@ -71,7 +71,7 @@ def parse_win_netstat(info): connstate = "LISTEN" else: continue - connections.append( (proto, local.split(":"), remote.split(":"), + connections.append( (proto, local.rsplit(":", 1), remote.rsplit(":", 1), win_netstat_states.get(connstate, connstate)) ) return connections

10 years, 11 months

Check_MK Git: check_mk: new script cmk_delete_host.py

by Andreas Boesl

Module: check_mk Branch: master Commit: 59f6f7e32c41046a91a348f820b76fd2e4c408f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59f6f7e32c4104… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 10:06:15 2013 +0200 new script cmk_delete_host.py --- doc/treasures/cmk_delete_host.py | 130 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/doc/treasures/cmk_delete_host.py b/doc/treasures/cmk_delete_host.py new file mode 100755 index 0000000..978a1c5 --- /dev/null +++ b/doc/treasures/cmk_delete_host.py @@ -0,0 +1,130 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +#Author: Andreas Boesl ab(a)mathias-kettner.de + +# This script +# 1) deletes the given hosts from WATO +# 2) creates new core config +# 3) restarts omd site +# 4) removes all data (including rrd files) from the given hosts + +import os, sys, shutil, pprint + +# Set automation user login credentials +automation_user = "cmdb_automation" +automation_secret = "UVEMFMCBITYUURHPILKP" + + +def usage(): + print "usage: cmk_delete_host {hostname1 hostname2}" + print "Script needs to be executed as site user" + +if len(sys.argv) == 1: + usage() + sys.exit(1) + +# Check if the given host exists +# Simple approach: Each host managed by wato has a host tag for its folder +# which starts with /wato/ +# If this is missing -> host does not exist + +# Remove the host in WATO +omd_site = os.environ["OMD_SITE"] +if not omd_site: + print "This script is only executable as site user" + sys.exit(1) + +g_current_host = None +def log(text): + print "%s: %s" % (g_current_host, text) + +def get_wato_folder(hostname): + process = os.popen("cmk -D " + hostname, "r") + output = process.read().split("\n") + for line in output: + if line.startswith("Tags:"): + for tag in line.split()[1:]: + if tag.startswith("/wato/"): + return tag[6:-1] + else: + log("Host not managed by WATO") + break + else: + log("Host has no tags") + return + + +# Start deletion +wato_config_changed = False +for hostname in sys.argv[1:]: + if not hostname.strip(): + continue + + g_current_host = hostname + wato_folder = get_wato_folder(hostname) + if wato_folder == None: + continue + + wato_config_changed = True + # Remove the host in WATO + command = "curl -s 'http://localhost/%(omd_site)s/check_mk/wato.py?mode=folder"\ + "&_username=%(automation_user)s"\ + "&_secret=%(automation_secret)s"\ + "&_do_actions=yes"\ + "&_do_confirm=yes"\ + "&_delete_host=%(hostname)s"\ + "&_transid=-1"\ + "&folder=%(wato_folder)s' 1>/dev/null" % { "automation_user": automation_user, + "automation_secret": automation_secret, + "omd_site": omd_site, + "hostname": hostname, + "wato_folder": wato_folder } + + os.system(command) + +# Generate monitoring configuration and restart core +if wato_config_changed: + os.system("cmk -R ; omd restart") + +# Flushing counters, cache files, piggy files, logfiles and autochecks +print "Flushing data" +os.system("cmk --flush %s" % " ".join(sys.argv[1:])) +for hostname in sys.argv[1:]: + if not hostname.strip(): + continue + + g_current_host = hostname + + # Remove rrd files + path_rrd = "~/var/pnp4nagios/perfdata/" + hostname + path_rrd = os.path.expanduser(path_rrd) + if os.path.exists(path_rrd): + log("Removing path " + path_rrd) + shutil.rmtree(path_rrd) + else: + log("Host has no perfdata") +

10 years, 11 months

Check_MK Git: check_mk: fixed typo

by Andreas Boesl

Module: check_mk Branch: master Commit: 006fbac37a02b38c1bef096847dc3ddab9cc6876 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=006fbac37a02b3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 09:11:55 2013 +0200 fixed typo --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8a3223c..d2149c7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9778,7 +9778,7 @@ def mode_ineffective_rules(phase): html.write('<div class=rulesets>') all_hosts = load_all_hosts() - html.write("<div class=info>" + _("The following rules do match match to any of the existing hosts.") + "</div>") + html.write("<div class=info>" + _("The following rules do not match to any of the existing hosts.") + "</div>") have_ineffective = False for groupname in groupnames:

10 years, 11 months

Check_MK Git: check_mk: FIX: notify: fix exception on latin-1 encoded variable content

by Mathias Kettner

Module: check_mk Branch: master Commit: 4a999dedb528871c3fe5813eb938d868ae931628 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a999dedb52887… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 22 18:05:07 2013 +0200 FIX: notify: fix exception on latin-1 encoded variable content --- modules/notify.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 39dd198..5ac931f 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -429,7 +429,17 @@ def notification_context_from_env(): for (var, value) in os.environ.items() if var.startswith("NOTIFY_") - and not re.match('^\$[A-Z]+\$$', value)]) + and not dead_nagios_variable(value) ]) + +def dead_nagios_variable(value): + if len(value) < 3: + return False + if value[0] != '$' or value[-1] != '$': + return False + for c in value[1:-1]: + if not c.isupper() and c != '_': + return False + return True def convert_context_to_unicode(context):

10 years, 11 months

Check_MK Git: check_mk: Simplify implementation of notify --keepalive

by Mathias Kettner

Module: check_mk Branch: master Commit: 3335179923e78ad11a6b6f3d9e6e28e72bfdc6dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3335179923e78a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 22 17:51:47 2013 +0200 Simplify implementation of notify --keepalive --- modules/notify.py | 131 +++++++++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 59 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 9102a46..39dd198 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -311,7 +311,7 @@ def do_notify(args): notify_keepalive() else: - notify_notify() + notify_notify(notification_context_from_env()) except Exception, e: if g_interactive: @@ -345,81 +345,91 @@ def notify_config_timestamp(): def notify_keepalive(): - global g_notify_readahead_buffer - g_notify_readahead_buffer = "" config_timestamp = notify_config_timestamp() - # Send signal that we are ready to receive the next notification - sys.stdout.write("*") - sys.stdout.flush() + # Send signal that we are ready to receive the next notification, but + # not after a config-reload-restart (see below) + if os.getenv("CMK_NOTIFY_RESTART") != "1": + notify_log("Starting in keepalive mode with PID %d" % os.getpid()) + sys.stdout.write("*") + sys.stdout.flush() + else: + notify_log("We are back after a restart.") while True: try: # If the configuration has changed, we do a restart. But we do # this check just before the next notification arrives. We must - # *not* read data from stdin, just peek! On the other hand we - # must *not* restart when there is danger that the buffered - # sys.stdin has already read data from the next notification. That - # would get lost! So we do restart if: - # - The last time we look *no* data was available on stdin. - # - Now there *is* data available - # - The buffer of stdin is empty - # - The timestamp of the youngest configuration file has changed. + # *not* read data from stdin, just peek! There is still one + # problem: when restarting we must *not* send the initial '*' + # byte, because that must be not no sooner then the notification + # has been sent. We do this by setting the environment variable + # CMK_NOTIFY_RESTART=1 + if notify_data_available(): - if not g_notify_readahead_buffer: - current_config_timestamp = notify_config_timestamp() - if current_config_timestamp > config_timestamp: - notify_log("Configuration has changed. Restarting myself.") - os.execvp("cmk", sys.argv) - - new_data = os.read(0, 20000) - if not new_data: - sys.exit(0) # closed stdin - g_notify_readahead_buffer += new_data - if g_notify_readahead_buffer.startswith('\n\n'): - sys.exit(0) - while '\n\n' in g_notify_readahead_buffer: + current_config_timestamp = notify_config_timestamp() + if current_config_timestamp > config_timestamp: + notify_log("Configuration has changed. Restarting myself.") + os.putenv("CMK_NOTIFY_RESTART", "1") + os.execvp("cmk", sys.argv) + + data = "" + while not data.endswith("\n\n"): try: - notify_notify() + new_data = "" + new_data = os.read(0, 32768) + except IOError, e: + new_data = "" except Exception, e: if opt_debug: raise - notify_log("ERROR %s\n%s" % (e, format_exception())) - sys.stdout.write("*") - sys.stdout.flush() + notify_log("Cannot read data from CMC: %s" % e) + + if not new_data: + notify_log("CMC has closed the connection. Shutting down.") + sys.exit(0) # closed stdin, this is + data += new_data + + try: + context = notification_context_from_string(data.rstrip('\n')) + notify_notify(context) + except Exception, e: + if opt_debug: + raise + notify_log("ERROR %s\n%s" % (e, format_exception())) + + # Signal that we are ready for the next notification + sys.stdout.write("*") + sys.stdout.flush() except Exception, e: if opt_debug: raise notify_log("ERROR %s\n%s" % (e, format_exception())) -# Note: The values of the context are *always* unicode! -def notify_get_context(): - global g_notify_readahead_buffer - if opt_keepalive: - # Context is line-by-line in g_notify_readahead_buffer - this_part, rest = g_notify_readahead_buffer.split('\n\n', 1) - g_notify_readahead_buffer = rest - context = {} - try: - for line in this_part.split('\n'): - varname, value = line.strip().split("=", 1) - context[varname] = value - except Exception, e: # line without '=' ignored or alerted - if opt_debug: - raise - return context - else: - # Information about notification is excpected in the - # environment in variables with the prefix NOTIFY_ - return dict([ - (var[7:], value) - for (var, value) - in os.environ.items() - if var.startswith("NOTIFY_") - and not re.match('^\$[A-Z]+\$$', value)]) +def notification_context_from_string(data): + # Context is line-by-line in g_notify_readahead_buffer + context = {} + try: + for line in data.split('\n'): + varname, value = line.strip().split("=", 1) + context[varname] = value + except Exception, e: # line without '=' ignored or alerted + if opt_debug: + raise + return context + +def notification_context_from_env(): + # Information about notification is excpected in the + # environment in variables with the prefix NOTIFY_ + return dict([ + (var[7:], value) + for (var, value) + in os.environ.items() + if var.startswith("NOTIFY_") + and not re.match('^\$[A-Z]+\$$', value)]) def convert_context_to_unicode(context): @@ -435,8 +445,7 @@ def convert_context_to_unicode(context): value_unicode = u"(Invalid byte sequence)" context[key] = value_unicode -def notify_notify(): - context = notify_get_context() +def notify_notify(context): notify_log("Got notification context with %s variables" % len(context)) # Add a few further helper variables @@ -516,7 +525,7 @@ def notify_via_email(context, write_into_spoolfile): subject = substitute_context(subject_t, context) context["SUBJECT"] = subject body = substitute_context(notification_common_body + body_t, context) - command = substitute_context(notification_mail_command, context) + command = substitute_context(notification_mail_command, context) + " >/dev/null 2>&1" command_utf8 = command.encode("utf-8") if notification_logging >= 2: notify_log("Executing command: %s" % command) @@ -528,6 +537,10 @@ def notify_via_email(context, write_into_spoolfile): os.putenv("LANG", "C.UTF-8") if notification_logging >= 2: file(var_dir + "/notify/body.log", "w").write(body.encode("utf-8")) + + # Important: we must not output anything on stdout or stderr. Data of stdout + # goes back into the socket to the CMC in keepalive mode and garbles the + # handshake signal. return os.popen(command_utf8, "w").write(body.encode("utf-8"))

10 years, 11 months

Check_MK Git: check_mk: FIX: fix logwatch pattern analyzer after direct access to the page

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d433c095126fa1c2ce95a59564bf17e4dfd6622 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d433c095126fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 22 17:05:32 2013 +0200 FIX: fix logwatch pattern analyzer after direct access to the page --- ChangeLog | 3 ++- web/htdocs/wato.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3232296..d38b6d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -274,7 +274,8 @@ * FIX: avoid exception when called first time and first page ist host tags * FIX: fix validation of time-of-day input field (24:00) * FIX: automation users can now be deleted again (bug was introduced in 1.2.2p1) - + * FIX: fix logwatch pattern analyzer message "The host xyz is not + managed by WATO." after direct access via snapin 1.2.2p2: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f35d554..ebdae6d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11841,6 +11841,7 @@ def mode_pattern_editor(phase): html.text_input('match', cssclass = 'match', size=100) forms.end() html.button('_try', _('Try out')) + html.del_var('folder') # Never hand over the folder here html.hidden_fields() html.end_form()

10 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013