Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

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

by Andreas Boesl

Module: check_mk Branch: master Commit: b6f1d960acbe06b48982b5402ede52f055f2a184 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6f1d960acbe06… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 24 14:55:19 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

Check_MK Git: check_mk: notification: service level: use host service level

by Andreas Boesl

Module: check_mk Branch: master Commit: 5df2937c47fba29b6f8e93ee0f184a583f3a3007 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5df2937c47fba2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 24 14:49:26 2013 +0200 notification: service level: use host service level if services service level is missing --- modules/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 0c47e36..a50e6a1 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -540,7 +540,7 @@ def should_notify(context, entry): # Check if the host has to be in a special service_level if "match_sl" in entry: from_sl, to_sl = entry['match_sl'] - if context['WHAT'] == "SERVICE": + if context['WHAT'] == "SERVICE" and context.get('SVC_SL','').isdigit(): sl = saveint(context['SVC_SL']) else: sl = saveint(context['HOST_SL'])

11 years

Check_MK Git: check_mk: notification: service level: use host service level

by Andreas Boesl

Module: check_mk Branch: master Commit: 22a8dc125c3f5c4761700cd26b19221a9685cf7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22a8dc125c3f5c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 24 14:49:26 2013 +0200 notification: service level: use host service level if services service level is missing --- modules/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 0c47e36..a50e6a1 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -540,7 +540,7 @@ def should_notify(context, entry): # Check if the host has to be in a special service_level if "match_sl" in entry: from_sl, to_sl = entry['match_sl'] - if context['WHAT'] == "SERVICE": + if context['WHAT'] == "SERVICE" and context.get('SVC_SL','').isdigit(): sl = saveint(context['SVC_SL']) else: sl = saveint(context['HOST_SL'])

11 years

Check_MK Git: check_mk: Updated bug entries #0977

by Mathias Kettner

Module: check_mk Branch: master Commit: fce90e7a21f3007dcbfb81df5fadad94e4e176ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fce90e7a21f300… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 23 11:22:43 2013 +0200 Updated bug entries #0977 --- .bugs/977 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/977 b/.bugs/977 new file mode 100644 index 0000000..9feeb5f --- /dev/null +++ b/.bugs/977 @@ -0,0 +1,11 @@ +Title: Invalid reload after command execution +Component: multisite +State: open +Date: 2013-06-23 11:21:05 +Targetversion: 1.2.3 +Class: bug + +When you issue a command on hosts/services and confirm then you see a blue +message with a link back to the view. In that situation there must be no +reload of the view container. But this happens. If you wait long enough then +hosts/services get visible again.

11 years

Check_MK Git: check_mk: Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 7aceb3c4f265dc469728cd4bb20370281a983191 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aceb3c4f265dc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 23 11:20:40 2013 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 366e0a0..45b0f82 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -977 +987

11 years

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 7dfb5891cb659b1f93a1405a07a23b641b345ff4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dfb5891cb659b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 21 14:10:13 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years

Check_MK Git: check_mk: keep alive mode alarm handling debugging

by Lars Michelsen

Module: check_mk Branch: master Commit: 7bda12dad35c9172a22316cd7e89b165f792ad31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bda12dad35c91… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 21 14:10:10 2013 +0200 keep alive mode alarm handling debugging --- modules/check_mk_base.py | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7d795fb..8225234 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -988,7 +988,7 @@ def do_check_keepalive(): def check_timeout(signum, frame): raise MKCheckTimeout() - signal.signal(signal.SIGALRM, check_timeout) + signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc global total_check_output total_check_output = "" @@ -1012,28 +1012,31 @@ def do_check_keepalive(): break timeout = int(sys.stdin.readline()) - try: - signal.alarm(timeout) - if ';' in hostname: - hostname, ipaddress = hostname.split(";", 1) - elif hostname in ipaddress_cache: - ipaddress = ipaddress_cache[hostname] - else: - if is_cluster(hostname): - ipaddress = None + try: # catch non-timeout exceptions + try: # catch timeouts + signal.signal(signal.SIGALRM, check_timeout) + signal.alarm(timeout) + if ';' in hostname: + hostname, ipaddress = hostname.split(";", 1) + elif hostname in ipaddress_cache: + ipaddress = ipaddress_cache[hostname] else: - try: - ipaddress = lookup_ipaddress(hostname) - except: - raise MKGeneralException("Cannot resolve hostname %s into IP address" % hostname) - ipaddress_cache[hostname] = ipaddress + if is_cluster(hostname): + ipaddress = None + else: + try: + ipaddress = lookup_ipaddress(hostname) + except: + raise MKGeneralException("Cannot resolve hostname %s into IP address" % hostname) + ipaddress_cache[hostname] = ipaddress - try: status = do_check(hostname, ipaddress) + signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc signal.alarm(0) except MKCheckTimeout: + signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc status = 3 - total_check_output = "UNKNOWN - Check_MK timed out after %d seconds" % timeout + total_check_output = "UNKNOWN - Check_MK timed out after %d seconds\n" % timeout sys.stdout.write("%03d\n%08d\n%s" % (status, len(total_check_output), total_check_output)) @@ -1058,6 +1061,7 @@ def do_check_keepalive(): sys.stdout.write("UNKNOWN - %s\n3\n" % e) + def check_unimplemented(checkname, params, info): return (3, 'UNKNOWN - Check not implemented')

11 years

Check_MK Git: check_mk: Updated bug entries #0895

by Mathias Kettner

Module: check_mk Branch: master Commit: 70d532681fef5cef298dd56598f2a5e457d09a4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70d532681fef5c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 21 11:59:17 2013 +0200 Updated bug entries #0895 --- .bugs/895 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/895 b/.bugs/895 new file mode 100644 index 0000000..413cd30 --- /dev/null +++ b/.bugs/895 @@ -0,0 +1,10 @@ +Title: Inventory check should honor exit code settings +Component: core +State: open +Date: 2013-06-21 11:58:34 +Targetversion: future +Class: bug + +If you use the feature that the Check_MK exit code is also OK +when the host is down, that should also apply for the inventory +check.

11 years

Check_MK Git: check_mk: Fix encoding problem in keepalive notification

by Mathias Kettner

Module: check_mk Branch: master Commit: 7cf1cfbf20587d35aef12be4c9112214bbcd8047 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cf1cfbf20587d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 21 09:55:44 2013 +0200 Fix encoding problem in keepalive notification --- modules/notify.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index b68c0cb..0c47e36 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -368,12 +368,12 @@ def notify_keepalive(): notify_log("Configuration has changed. Restarting myself.") os.execvp("cmk", sys.argv) - new_data = os.read(0, 4096) + 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'): - exit(0) + sys.exit(0) while '\n\n' in g_notify_readahead_buffer: notify_notify() except Exception, e: @@ -381,6 +381,7 @@ def notify_keepalive(): 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: @@ -391,7 +392,7 @@ def notify_get_context(): try: for line in this_part.split('\n'): varname, value = line.strip().split("=", 1) - context[varname] = value.decode("utf-8") + context[varname] = value except Exception, e: # line without '=' ignored or alerted if opt_debug: raise @@ -401,13 +402,25 @@ def notify_get_context(): # Information about notification is excpected in the # environment in variables with the prefix NOTIFY_ return dict([ - (var[7:], value.decode("utf-8")) + (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): + # Convert all values to unicode + for key, value in context.iteritems(): + if type(value) == str: + try: + value_unicode = value.decode("utf-8") + except: + try: + value_unicode = value.decode("latin-1") + except: + value_unicode = u"(Invalid byte sequence)" + context[key] = value_unicode def notify_notify(): context = notify_get_context() @@ -452,6 +465,8 @@ def notify_notify(): if context['WHAT'] != 'HOST' and 'LASTSERVICESTATECHANGE' in context: context['LASTSERVICESTATECHANGE_REL'] = get_readable_rel_date(context['LASTSERVICESTATECHANGE']) + convert_context_to_unicode(context) + if notification_logging >= 2: notify_log("Notification context:\n" + "\n".join(["%s=%s" % v for v in sorted(context.items())])) @@ -620,7 +635,7 @@ def call_notification_script(plugin, parameters, context, write_into_spoolfile): # Export complete context to have all vars in environment. # Existing vars are replaced, some already existing might remain for key in context: - os.putenv('NOTIFY_' + key, context[key].encode('utf-8')) + os.putenv('NOTIFY_' + key, context[key].encode('utf-8')) # Remove service macros for host notifications if context['WHAT'] == 'HOST':

11 years

Check_MK Git: check_mk: Fixed two typos in logfile messages

by Mathias Kettner

Module: check_mk Branch: master Commit: bbfa5177c143b829945d53cedf274b5cd14efdb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbfa5177c143b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 21 09:28:21 2013 +0200 Fixed two typos in logfile messages --- modules/notify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 1ba3024..b68c0cb 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -519,7 +519,7 @@ def should_notify(context, entry): if entry.get("only_hosts"): hostname = context.get("HOSTNAME") if hostname not in entry["only_hosts"]: - notify_log(" - Skipping: host '%s' matches non of %s" % (hostname, ", ".join(entry["only_hosts"]))) + notify_log(" - Skipping: host '%s' matches none of %s" % (hostname, ", ".join(entry["only_hosts"]))) return False # Check if the host has to be in a special service_level @@ -554,7 +554,7 @@ def should_notify(context, entry): skip = negate break if skip: - notify_log(" - Skipping: service '%s' matches non of %s" % ( + notify_log(" - Skipping: service '%s' matches none of %s" % ( servicedesc, ", ".join(entry["only_services"]))) return False

11 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013