Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

Check_MK Git: check_mk: clusters: removed version for Check_MK service output

by Lars Michelsen

Module: check_mk Branch: master Commit: 817df4e15db8190299c53511d94a85fe79ceb31c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=817df4e15db819… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 17 08:53:41 2013 +0200 clusters: removed version for Check_MK service output --- ChangeLog | 2 ++ modules/.f12 | 2 +- modules/check_mk_base.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3daa9f6..9b4f8e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,8 @@ * windows agent: no longer tries to execute directories * FIX: esx_vsphere_datastores: Fix incomplete performance data and Perf-O-Meter * fileinfo: no longer inventorize missing files(reported by windows agent) + * cluster hosts: removed agent version output from Check_MK service (this + was misleading for different agent versions on multiple nodes) Multisite: * User accounts can now be locked after a specified amount of auth diff --git a/modules/.f12 b/modules/.f12 index b1a4d0b..ab5e57d 100644 --- a/modules/.f12 +++ b/modules/.f12 @@ -1,3 +1,3 @@ -SITE=${SITE:-cmc} +SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo cp -v *.py /omd/sites/$SITE/share/check_mk/modules/ sudo su - $SITE -c "cmk --debug -U" diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index d89c202..f79969f 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -902,7 +902,7 @@ def do_check(hostname, ipaddress, only_check_types = None): status = exit_spec.get("wrong_version", 1) else: output = "" - if agent_version != None: + if not is_cluster(hostname) and agent_version != None: output += "Agent version %s, " % agent_version status = 0

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: 525b6afe297201876366d0f60dea1cea846cdd35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=525b6afe297201… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 18 09:23:02 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years

Check_MK Git: check_mk: FIX: winperf_processor: fix case where CPU percent is exactly 100%

by Mathias Kettner

Module: check_mk Branch: master Commit: b7baff16bfc5bdbb70d0aa5638ca8a91bd0726b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7baff16bfc5bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 17 16:00:46 2013 +0200 FIX: winperf_processor: fix case where CPU percent is exactly 100% Conflicts: ChangeLog --- ChangeLog | 5 +++++ checks/winperf_processor | 21 +++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3daa9f6..1400b9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -180,6 +180,11 @@ * Remove Notification Command user settings, please use flexible notifications instead +1.2.2p3: + Checks & Agents: + * FIX: winperf_processor: fix case where CPU percent is exactly 100% + + 1.2.2p2: Core: * FIX: livecheck: fixed handling of one-line plugin outputs and missing \n diff --git a/checks/winperf_processor b/checks/winperf_processor index 140ed02..75fd9e8 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -50,18 +50,15 @@ def check_winperf_util(_no_item, params, info): ticks = int(line[-2]) num_cpus = len(line) - 3 timedif, ticks_per_sec = get_counter("winperf_util", this_time, ticks) - if ticks_per_sec == 0.0: - used_perc = 0.0 - else: - # We get the value of the PERF_100NSEC_TIMER_INV here. - # This counter type shows the average percentage of active time observed - # during the sample interval. This is an inverse counter. Counters of this - # type calculate active time by measuring the time that the service was - # inactive and then subtracting the percentage of active time from 100 percent. - # - # 1 tick = 100ns, convert to seconds - cpusecs_per_sec = ticks_per_sec / 10000000.0 - used_perc = 100 * (1 - cpusecs_per_sec) + # We get the value of the PERF_100NSEC_TIMER_INV here. + # This counter type shows the average percentage of active time observed + # during the sample interval. This is an inverse counter. Counters of this + # type calculate active time by measuring the time that the service was + # inactive and then subtracting the percentage of active time from 100 percent. + # + # 1 tick = 100ns, convert to seconds + cpusecs_per_sec = ticks_per_sec / 10000000.0 + used_perc = 100.0 * (1 - cpusecs_per_sec) # Due to timeing invariancies the measured level can become > 100%. # This makes users unhappy, so cut it off.

11 years

Check_MK Git: check_mk: Keepalive mode: allow to specify IP address

by Mathias Kettner

Module: check_mk Branch: master Commit: 510ab8c85932cbe64d550bf86dba3a9aebf9bf22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=510ab8c85932cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 16 13:06:34 2013 +0200 Keepalive mode: allow to specify IP address --- modules/check_mk_base.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index d9be202..d89c202 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -996,9 +996,6 @@ def do_check_keepalive(): ipaddress_cache = {} - # sys.stdout.write('*') - # sys.stdout.flush() # signal core that we are ready - while True: cleanup_globals() hostname = sys.stdin.readline() @@ -1010,12 +1007,15 @@ def do_check_keepalive(): sys.stdout.write("Restarting myself...\n") sys.stdout.flush() os.execvp("cmk", sys.argv) + elif not hostname: + break + timeout = int(sys.stdin.readline()) try: signal.alarm(timeout) - if not hostname: - break - if hostname in ipaddress_cache: + if ';' in hostname: + hostname, ipaddress = hostname.split(";", 1) + elif hostname in ipaddress_cache: ipaddress = ipaddress_cache[hostname] else: if is_cluster(hostname):

11 years

Check_MK Git: check_mk: Removed debug output

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b27a4fe8ffc2e7949af95c428c933a5e6a5a438 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b27a4fe8ffc2e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 15 12:01:00 2013 +0200 Removed debug output --- web/htdocs/wato.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c93267f..565bc8c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7441,9 +7441,6 @@ def cmc_rush_ahead_activation(): log_commit_pending() html.final_javascript("wato_hide_changes_button();") return True - else: - html.write("MIST: mtime_rush ist %r, mtime_pend ist %r" % - (mtime_rush, mtime_pend)) except Exception, e: if config.debug: raise

11 years

Check_MK Git: check_mk: Notify helper: restart itself after config change

by Mathias Kettner

Module: check_mk Branch: master Commit: a1d0aa77e2763e798bb064fd05ab2decc60f55a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1d0aa77e2763e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 14 11:31:38 2013 +0200 Notify helper: restart itself after config change --- modules/notify.py | 89 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 68 insertions(+), 21 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 8d5f9fc..2bc9257 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -34,8 +34,7 @@ # hostname, servicedesc, hoststate, servicestate, output in # the form %(variable)s -import pprint -import urllib +import pprint, urllib, select # Default settings notification_logdir = var_dir + "/notify" @@ -322,44 +321,92 @@ def do_notify(args): os.makedirs(crash_dir) file(crash_dir + "/crash.log", "a").write("CRASH:\n%s\n\n" % format_exception()) + +def notify_data_available(): + readable, writeable, exceptionable = select.select([0], [], [], None) + return not not readable + +def notify_config_timestamp(): + mtime = 0 + for dirpath, dirnames, filenames in os.walk(check_mk_configdir): + for f in filenames: + mtime = max(mtime, os.stat(dirpath + "/" + f).st_mtime) + mtime = max(mtime, os.stat(default_config_dir + "/main.mk").st_mtime) + try: + mtime = max(mtime, os.stat(default_config_dir + "/final.mk").st_mtime) + except: + pass + try: + mtime = max(mtime, os.stat(default_config_dir + "/local.mk").st_mtime) + except: + pass + return mtime + + + def notify_keepalive(): + global g_notify_readahead_buffer + g_notify_readahead_buffer = "" + config_timestamp = notify_config_timestamp() + while True: try: - notify_notify() + # 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. + 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, 4096) + 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) + while '\n\n' in g_notify_readahead_buffer: + notify_notify() except Exception, e: if opt_debug: raise notify_log("ERROR %s\n%s" % (e, format_exception())) def notify_get_context(): + global g_notify_readahead_buffer if opt_keepalive: - # Context read from stdin, variables with NOTIFY_ prefix. End of - # block is by empty line + # 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 = {} - while True: - try: - line = sys.stdin.readline() - if not line: - sys.exit(0) # End of transmission - line = line.strip() - if not line: - return context # End of this notification - else: - varname, value = line.split("=", 1) - context[varname] = value - except Exception, e: - if opt_debug: - raise + 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_ - context = dict([ + return dict([ (var[7:], value.decode("utf-8")) for (var, value) in os.environ.items() if var.startswith("NOTIFY_") and not re.match('^\$[A-Z]+\$$', value)]) - return context + def notify_notify():

11 years

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

by Mathias Kettner

Module: check_mk Branch: master Commit: b301ff6bfa94d95fc7e08b9b73f616190d34c213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b301ff6bfa94d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 14 10:11:30 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

Check_MK Git: check_mk: EC: better detect non-IP-number hosts in hostname translation

by Mathias Kettner

Module: check_mk Branch: master Commit: 37b8b9d79e1317b17216e25c07b725d2bddd8e82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37b8b9d79e1317… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 14 10:11:25 2013 +0200 EC: better detect non-IP-number hosts in hostname translation --- ChangeLog | 1 + mkeventd/bin/mkeventd | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d17326..3daa9f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * New global setting "force message archiving", converts the EC into a kind of syslog archive * FIX: fix layout of filter for history action type + * FIX: better detect non-IP-number hosts in hostname translation 1.2.3i1: Core: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 37a3ff2..3d63bd9 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1556,8 +1556,13 @@ class EventServer: backedhost = backedhost.lower() # 2. Drop domain part (not applied to IP addresses!) - if translation.get("drop_domain") and backedhost and not backedhost[0].isdigit(): - backedhost = backedhost.split(".", 1)[0] + if translation.get("drop_domain") and backedhost: + # only apply if first part does not convert successfully into an int + firstpart = backedhost.split(".", 1)[0] + try: + int(firstpart) + except: + backedhost = firstpart # 3. Regular expression conversion if "regex" in translation:

11 years

Check_MK Git: check_mk: Cleaned up ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: 2ebc4565ce69faa2cf02246304531ca6da9fe8c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ebc4565ce69fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 14 10:10:52 2013 +0200 Cleaned up ChangeLog --- ChangeLog | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73ab12a..1d17326 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,27 +2,12 @@ Core: * New option -B for just generating the configuration - Multisite: - * User accounts can now be locked after a specified amount of auth - failures (lock_on_logon_failures can be set to a number of tries) - * FIX: better error message in case of exception in SNMP handling - * Column Perf-O-Meter is now sortable: it sorts after the *first* - performance value. This might not always be the one you like, but - its far better than nothing. - * logwatch: Logwatch icon no longer uses notes_url - * check_mk-if.pnp: fixed bug with pnp template on esx hosts without perfdata - Checks & Agents: * esx_hostystem multipath: criticize standby paths only if not equal to active paths * mk_logwatch: fixed bug when rewriting logwatch messages * check_mk: Re-inventory is no longer required when a service is ignored via rule * check_mk: Now possible to assign services to clusters without the need to reinventorize - - WATO: - * Allow to configure check-/retry_interval in second precision - - Checks & Agents: * lnx_if: Fixed crash on missing "Address" field * viprinet_router: Now able to set required target state via rule * windows_agent: Now available as 64 bit version @@ -35,6 +20,19 @@ * FIX: esx_vsphere_datastores: Fix incomplete performance data and Perf-O-Meter * fileinfo: no longer inventorize missing files(reported by windows agent) + Multisite: + * User accounts can now be locked after a specified amount of auth + failures (lock_on_logon_failures can be set to a number of tries) + * FIX: better error message in case of exception in SNMP handling + * Column Perf-O-Meter is now sortable: it sorts after the *first* + performance value. This might not always be the one you like, but + its far better than nothing. + * logwatch: Logwatch icon no longer uses notes_url + * check_mk-if.pnp: fixed bug with pnp template on esx hosts without perfdata + + WATO: + * Allow to configure check-/retry_interval in second precision + Notifications: * Flexible Notification can now filter service levels * FIX: check_tcp corrected order of parameters in definition

11 years

Check_MK Git: check_mk: fixed error from code cleanup

by Andreas Boesl

Module: check_mk Branch: master Commit: da2255c40978786d2d18bf5c5597545db9822f14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da2255c4097878… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 14 09:44:17 2013 +0200 fixed error from code cleanup --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 727ef74..947b4f0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -967,7 +967,7 @@ def get_check_table(hostname): for nodename, checkname, item, params in node_checks: descr = service_description(checkname, item) if hostname == host_of_clustered_service(node, descr): - handle_entry(((hostname,) + entry[1:])) + handle_entry((hostname, checkname, item, params)) # Remove dependencies to non-existing services

11 years

← Newer
1
...
9
10
11
12
13
14
15
...
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