Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

6063 FIX Special agents: Remove unreplaced macros from special agent command lines

by Lars Michelsen

Module: check_mk Branch: master Commit: 4b558182d2c0d2cf077fb039cddf78243030b7c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b558182d2c0d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 9 13:41:03 2018 +0200 6063 FIX Special agents: Remove unreplaced macros from special agent command lines In previous versions the command lines of special agent calls like e.g. custom data source programs could contain unreplaced macros in the format <tt>$_HOST_MACRO$</tt> which were later inpterpreted as shell variables. In case there was no such variable in the shell environment, the trailing <tt>$</tt> was left on the command line as single character. This could lead to some broken command line calls. We now do the replacement as usual. After replacing all known macros, the command line is searched for left over $...$ macros and remove the whole macro from the command line. This should make optional macro handling a lot easier. Change-Id: I83d4152af691ea7a764c9fd7f6c210f0c078a64e --- .werks/6063 | 20 ++++++++++++++++++++ cmk_base/data_sources/programs.py | 8 ++++++++ tests/unit/cmk_base/test_data_sources_unit.py | 20 ++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/.werks/6063 b/.werks/6063 new file mode 100644 index 0000000..8187cb5 --- /dev/null +++ b/.werks/6063 @@ -0,0 +1,20 @@ +Title: Special agents: Remove unreplaced macros from special agent command lines +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525865298 + +In previous versions the command lines of special agent calls like e.g. custom +data source programs could contain unreplaced macros in the format <tt>$_HOST_MACRO$</tt> +which were later inpterpreted as shell variables. In case there was no such variable in +the shell environment, the trailing <tt>$</tt> was left on the command line as single +character. + +This could lead to some broken command line calls. We now do the replacement as usual. +After replacing all known macros, the command line is searched for left over $...$ macros +and remove the whole macro from the command line. This should make optional macro handling +a lot easier. diff --git a/cmk_base/data_sources/programs.py b/cmk_base/data_sources/programs.py index e3f49e4..8dd4f1f 100644 --- a/cmk_base/data_sources/programs.py +++ b/cmk_base/data_sources/programs.py @@ -29,6 +29,7 @@ import signal import subprocess import cmk.paths +import cmk.regex import cmk_base.console as console import cmk_base.config as config @@ -136,6 +137,7 @@ class DSProgramDataSource(ProgramDataSource): cmd = self._translate_legacy_macros(cmd) cmd = self._translate_host_macros(cmd) + cmd = self._cleanup_left_over_macros(cmd) return cmd @@ -157,6 +159,12 @@ class DSProgramDataSource(ProgramDataSource): return core_config.replace_macros(cmd, macros) + def _cleanup_left_over_macros(self, cmd): + """Now after we have replaced all known macros remove all remaining macros in + the format $...$ to prevent shell expansion of them""" + return cmk.regex.regex(r"\$[a-zA-Z0-9_-]+\$").sub("", cmd) + + class SpecialAgentDataSource(ProgramDataSource): def __init__(self, hostname, ipaddress, special_agent_id, params): diff --git a/tests/unit/cmk_base/test_data_sources_unit.py b/tests/unit/cmk_base/test_data_sources_unit.py index 65503ef..10de607 100644 --- a/tests/unit/cmk_base/test_data_sources_unit.py +++ b/tests/unit/cmk_base/test_data_sources_unit.py @@ -34,3 +34,23 @@ def test_disable_data_source_cache_no_write(mocker): disabled_checker = mocker.patch.object(source, "is_agent_cache_disabled") assert source._write_cache_file("X") is None disabled_checker.assert_called_once() + + +def test_ds_command_line_expansion_legacy_macros(): + source = cmk_base.data_sources.programs.DSProgramDataSource("hostname", "ipaddress", "echo '<IP> <HOST>'") + assert source._get_command_line() == "echo 'ipaddress hostname'" + + +def test_ds_command_line_expansion_host_macros(): + source = cmk_base.data_sources.programs.DSProgramDataSource("hostname", "ipaddress", "echo '$HOSTNAME$'") + assert source._get_command_line() == "echo 'hostname'" + + +def test_ds_command_line_expansion_left_over_macros(): + source = cmk_base.data_sources.programs.DSProgramDataSource("hostname", "ipaddress", "echo '$BLABLUB$'") + assert source._get_command_line() == "echo ''" + + +def test_ds_command_line_expansion_skip_shell_variables(): + source = cmk_base.data_sources.programs.DSProgramDataSource("hostname", "ipaddress", "echo '$BLABLUB$ $XXX'") + assert source._get_command_line() == "echo ' $XXX'"

6 years, 4 months

6074 FIX postgres_sessions: Missing information about 'idle' or 'active' sessions means zero which is never shown

by Simon Betz

Module: check_mk Branch: master Commit: 62e3e1665d42b94716d97ccec941efedad0c78fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62e3e1665d42b9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 13:40:54 2018 +0200 6074 FIX postgres_sessions: Missing information about 'idle' or 'active' sessions means zero which is never shown Change-Id: I16f8fb18a508c9b1a7efa0b8cbc04f97cfc7301a --- .werks/6074 | 10 +++++++++ checks/postgres_sessions | 56 ++++++++++++++++++++++-------------------------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/.werks/6074 b/.werks/6074 new file mode 100644 index 0000000..66d1506 --- /dev/null +++ b/.werks/6074 @@ -0,0 +1,10 @@ +Title: postgres_sessions: Missing information about 'idle' or 'active' sessions means zero which is never shown +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525865939 +Class: fix + + diff --git a/checks/postgres_sessions b/checks/postgres_sessions index 71044d4..ac7283e 100644 --- a/checks/postgres_sessions +++ b/checks/postgres_sessions @@ -45,11 +45,11 @@ def parse_postgres_sessions(info): if line[0].startswith("[[[") and line[0].endswith("]]]"): instance_name = line[0][3:-3].upper() continue - parsed.setdefault(instance_name, {}) + instance = parsed.setdefault(instance_name, {}) if line[0].startswith("t"): - parsed[instance_name]["total"] = int(line[1]) + instance["total"] = int(line[1]) elif line[0].startswith("f"): - parsed[instance_name]["running"] = int(line[1]) + instance["running"] = int(line[1]) return parsed @@ -58,35 +58,31 @@ def inventory_postgres_sessions(parsed): def check_postgres_sessions(item, params, parsed): - if item in parsed: - idle = parsed[item]['total'] - running = parsed[item]['running'] - total = idle + running - status = 0 - infos = [] - perfdata = [] - for value, what, format, unit in [ - ( total, "total", "%d", "" ), - ( running, "running", "%d", "" )]: - infos.append((format + " %s%s") % (value, what, unit)) - if what in params: - warn, crit = params[what] - if value >= crit: - status = 2 - infos[-1] += "(!!)" - elif value >= warn: - status = max(status, 1) - infos[-1] += "(!)" - else: - warn, crit = None, None - perfdata.append((what, value, warn, crit)) + if item not in parsed: + # In case of missing information we assume that the login into + # the database has failed and we simply skip this check. It won't + # switch to UNKNOWN, but will get stale. + raise MKCounterWrapped("Login into database failed") - return (status, ", ".join(infos), perfdata) + data = parsed[item] + idle = data.get('total', 0) + running = data.get('running', 0) + total = idle + running - # In case of missing information we assume that the login into - # the database has failed and we simply skip this check. It won't - # switch to UNKNOWN, but will get stale. - raise MKCounterWrapped("Login into database failed") + for key, val in [ + ("total", total), + ("running", running), + ]: + infotext = "%s: %s" % (key.title(), val) + warn, crit = params.get(key, (None, None)) + state = 0 + if crit is not None and val >= crit: + state = 2 + elif warn is not None and val >= warn: + state = 1 + if state: + infotext += " (warn/crit at %s/%s)" % (warn, crit) + yield state, infotext, [(key, val, warn, crit)] check_info['postgres_sessions'] = {

6 years, 4 months

Nuked global variable lock_eventstatus.

by Sven Panne

Module: check_mk Branch: master Commit: 85e843287fd4bd0e93a7ae467a9e5bd66f16a9f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85e843287fd4bd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 13:15:09 2018 +0200 Nuked global variable lock_eventstatus. Change-Id: Id2bc512404edf9e3b9d3f76e9710ad62db97fce5 --- cmk/ec/main.py | 42 ++++++++++++------------ tests/integration/cmk/ec/test_mkeventd_status.py | 17 ++++++---- 2 files changed, 32 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=85e843287f…

6 years, 4 months

6073 FIX BI Aggregation Group Tree: Fixed missing filter

by Simon Betz

Module: check_mk Branch: master Commit: 778cf48d6849ec528c299ad07ae3482c71c1c07a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=778cf48d6849ec… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 13:11:45 2018 +0200 6073 FIX BI Aggregation Group Tree: Fixed missing filter Change-Id: I4768de80a9b58f22906542c2eddc51d0e400e865 --- .werks/6073 | 10 ++++++++++ web/plugins/sidebar/bi.py | 11 +++++------ web/plugins/views/builtin.py | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.werks/6073 b/.werks/6073 new file mode 100644 index 0000000..2d41aaf --- /dev/null +++ b/.werks/6073 @@ -0,0 +1,10 @@ +Title: BI Aggregation Group Tree: Fixed missing filter +Level: 1 +Component: bi +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525864260 +Class: fix + + diff --git a/web/plugins/sidebar/bi.py b/web/plugins/sidebar/bi.py index bd53451..8356239 100644 --- a/web/plugins/sidebar/bi.py +++ b/web/plugins/sidebar/bi.py @@ -84,19 +84,18 @@ def _build_tree(group, parent, path): def _render_tree(tree): for group, attrs in tree.iteritems(): - fetch_url = html.makeuri_contextless([ - ("view_name", "aggr_all"), - ("aggr_group_tree", html.urlencode("/".join(attrs["__path__"])))], - "view.py") - if attrs.get('__children__'): html.begin_foldable_container("bi_aggregation_groups", group, False, - HTML(html.render_a(group, href=fetch_url, + HTML(html.render_a(group, href=None, target="main"))) _render_tree(attrs['__children__']) html.end_foldable_container() else: html.open_ul() + fetch_url = html.makeuri_contextless([ + ("view_name", "aggr_all"), + ("aggr_group_tree", html.urlencode("/".join(attrs["__path__"])))], + "view.py") bulletlink(group, fetch_url) html.close_ul() diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 9f1536d..097f47f 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2368,6 +2368,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': False, 'show_filters': ['aggr_group', + 'aggr_group_tree', 'aggr_hosts', 'aggr_name_regex', 'aggr_state',

6 years, 4 months

Nuked global variale lock_configuration.

by Sven Panne

Module: check_mk Branch: master Commit: a4308d7c1bea71169fb59e95f904392d215167f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4308d7c1bea71… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 13:01:48 2018 +0200 Nuked global variale lock_configuration. Change-Id: I8959d71b348c69213f8741fe6a65287d0c7631c6 --- cmk/ec/main.py | 36 +++++++++++++----------- tests/integration/cmk/ec/test_mkeventd_status.py | 13 ++++++--- 2 files changed, 28 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a4308d7c1b…

6 years, 4 months

5925 FIX Use 10 min default timeout for Windows updates plugin

by Jukka Aro

Module: check_mk Branch: master Commit: be97eb61a545e17f94f3c7fc315ce52e24ce6868 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be97eb61a545e1… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed May 9 12:59:46 2018 +0200 5925 FIX Use 10 min default timeout for Windows updates plugin The plugin windows_updates.vbs has the tendency of running quite long. The default execution timeout of 60s for Windows plugins is in most cases not enough, resulting in the plugin being started every time the Windows agent is contacted and always timing out after 60s without delivering results. At its worst the plugin may cause high CPU load repeated every minute. Most users of windows_updates.vbs have been forced to configure a timeout rule for the plugin in Agent Bakery. To simplify this process, Agent Bakery now delivers windows_updates.vbs with a preconfigured timeout of 10 minutes that should be enough for most users. The already existing defaults for async execution and cache_age of 4 hours were preserved. --- .werks/5925 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.werks/5925 b/.werks/5925 new file mode 100644 index 0000000..448c0e1 --- /dev/null +++ b/.werks/5925 @@ -0,0 +1,24 @@ +Title: Use 10 min default timeout for Windows updates plugin +Level: 1 +Component: checks +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1525863190 +Class: fix + +The plugin windows_updates.vbs has the tendency of running quite long. +The default execution timeout of 60s for Windows plugins is in most +cases not enough, resulting in the plugin being started every time +the Windows agent is contacted and always timing out after 60s without +delivering results. At its worst the plugin may cause high CPU load +repeated every minute. + +Most users of windows_updates.vbs have been forced to configure a +timeout rule for the plugin in Agent Bakery. To simplify this process, +Agent Bakery now delivers windows_updates.vbs with a preconfigured +timeout of 10 minutes that should be enough for most users. The +already existing defaults for async execution and cache_age of 4 hours +were preserved. + +

6 years, 4 months

Nuked global variable lock_logging.

by Sven Panne

Module: check_mk Branch: master Commit: c21842adbf2925a3e9cac06b0e7df22be0ae9b2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c21842adbf2925… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 12:37:05 2018 +0200 Nuked global variable lock_logging. Change-Id: I767b8ea837587900d892b1ba5c39ba79db88da76 --- cmk/ec/main.py | 103 ++++++++++++----------- tests/integration/cmk/ec/test_mkeventd_status.py | 17 ++-- 2 files changed, 64 insertions(+), 56 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c21842adbf…

6 years, 4 months

5809 New Web API Call: delete_hosts, allows to delete multiple hosts at once

by Andreas Boesl

Module: check_mk Branch: master Commit: 13dba66f5e514e024dad21c71e01fd6ed09e0493 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13dba66f5e514e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 9 12:42:45 2018 +0200 5809 New Web API Call: delete_hosts, allows to delete multiple hosts at once The required payload for delete_hosts is a variable <tt>hostnames</tt> with a list of hostnames. For example, <tt>"hostnames": ["host1", "host2", "host3"]</tt>. The API returns an error if a specified host does not exist. Change-Id: I788711d72507b446a2aa5cba223e77e9b9c2da0d --- .werks/5809 | 16 ++++++++++++++++ web/plugins/webapi/webapi.py | 23 +++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/.werks/5809 b/.werks/5809 new file mode 100644 index 0000000..e9eb964 --- /dev/null +++ b/.werks/5809 @@ -0,0 +1,16 @@ +Title: New Web API Call: delete_hosts, allows to delete multiple hosts at once +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525862330 +Class: feature + +The required payload for delete_hosts is a variable <tt>hostnames</tt> with a list of hostnames. + +For example, <tt>"hostnames": ["host1", "host2", "host3"]</tt>. + +The API returns an error if a specified host does not exist. + + diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index b2a41f1..cce2963 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -310,6 +310,10 @@ class APICallHosts(APICallCollection): "handler" : self._delete, "locking" : True, }, + "delete_hosts": { + "handler" : self._delete_hosts, + "locking" : True, + }, "get_all_hosts": { "handler" : self._get_all, "locking" : False, @@ -442,6 +446,25 @@ class APICallHosts(APICallCollection): host.folder().delete_hosts([host.name()]) + def _delete_hosts(self, request): + validate_request_keys(request, required_keys=["hostnames"]) + + all_hosts = watolib.Host.all() + delete_hostnames = set(request["hostnames"]) + all_hostnames = set(all_hosts.keys()) + + unknown_hosts = delete_hostnames - all_hostnames + if unknown_hosts: + raise MKUserError(None, _("No such host(s): %s") % ", ".join(unknown_hosts)) + + grouped_by_folders = {} + for hostname in delete_hostnames: + grouped_by_folders.setdefault(all_hosts[hostname].folder(), []).append(hostname) + + for folder, hostnames in grouped_by_folders.iteritems(): + folder.delete_hosts(hostnames) + + #. # .--Groups--------------------------------------------------------------. # | ____ |

6 years, 4 months

Moved lock to smaller scope. Removed default arg. Inlined function.

by Sven Panne

Module: check_mk Branch: master Commit: 02ff5d163242ba3c05a8c27810af443919da4bae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02ff5d163242ba… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 12:21:06 2018 +0200 Moved lock to smaller scope. Removed default arg. Inlined function. Change-Id: Id31c48c7dd86aa9c3ffad232db393ebc341dc393 --- cmk/ec/main.py | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index e62fa9a..0e78d36 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1111,32 +1111,28 @@ def current_history_period(config): # Delete old log files -def expire_logfiles(settings, config, flush=False): - try: - days = config["history_lifetime"] - min_mtime = time.time() - days * 86400 - logger.verbose("Expiring logfiles (Horizon: %d days -> %s)" % - (days, cmk.render.date_and_time(min_mtime))) - for path in settings.paths.history_dir.value.glob('*.log'): - if flush or path.stat().st_mtime < min_mtime: - logger.info("Deleting log file %s (age %s)" % - (path, cmk.render.date_and_time(path.stat().st_mtime))) - path.unlink() - except Exception as e: - if settings.options.debug: - raise - logger.exception("Error expiring log files: %s" % e) +def expire_logfiles(settings, config, flush): + with lock_logging: + try: + days = config["history_lifetime"] + min_mtime = time.time() - days * 86400 + logger.verbose("Expiring logfiles (Horizon: %d days -> %s)" % + (days, cmk.render.date_and_time(min_mtime))) + for path in settings.paths.history_dir.value.glob('*.log'): + if flush or path.stat().st_mtime < min_mtime: + logger.info("Deleting log file %s (age %s)" % + (path, cmk.render.date_and_time(path.stat().st_mtime))) + path.unlink() + except Exception as e: + if settings.options.debug: + raise + logger.exception("Error expiring log files: %s" % e) def flush_event_history(settings, config, mongodb): if config['archive_mode'] == 'mongodb': flush_event_history_mongodb(mongodb) else: - flush_event_history_files(settings, config) - - -def flush_event_history_files(settings, config): - with lock_logging: expire_logfiles(settings, config, True) @@ -1778,8 +1774,7 @@ class EventServer(ECServerThread): self.hk_cleanup_downtime_events() if self._config['archive_mode'] != 'mongodb': - with lock_logging: - expire_logfiles(self.settings, self._config) + expire_logfiles(self.settings, self._config, False) # For all events that have been created in a host downtime check the host # whether or not it is still in downtime. In case the downtime has ended

6 years, 4 months

6072 FIX humidity.include: Allow levels which are zero

by Simon Betz

Module: check_mk Branch: master Commit: 1a8bb18371e4a8b4272dbc86cc991431dda323af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a8bb18371e4a8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 12:19:49 2018 +0200 6072 FIX humidity.include: Allow levels which are zero Change-Id: Ic86478cf72c254074823089164136a3789bd0fa7 --- .werks/6072 | 10 ++++++++++ checks/humidity.include | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.werks/6072 b/.werks/6072 new file mode 100644 index 0000000..85ef654 --- /dev/null +++ b/.werks/6072 @@ -0,0 +1,10 @@ +Title: humidity.include: Allow levels which are zero +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525861120 +Class: fix + + diff --git a/checks/humidity.include b/checks/humidity.include index f9ae72a..a911a4f 100644 --- a/checks/humidity.include +++ b/checks/humidity.include @@ -43,30 +43,30 @@ def check_humidity(humidity, params): perfdata = [ ("humidity", humidity, warn_upper, crit_upper, 0, 100) ] infotext = get_percent_human_readable(humidity) - if warn_lower and crit_lower: + if warn_lower is not None and crit_lower is not None: levelstext_lower = " (warn/crit below %s/%s)" % ( get_percent_human_readable(warn_lower), get_percent_human_readable(crit_lower)) - if warn_upper and crit_upper: + if warn_upper is not None and crit_upper is not None: levelstext_upper = " (warn/crit at %s/%s)" % ( get_percent_human_readable(warn_upper), get_percent_human_readable(crit_upper)) status = 0 levelstext = "" - if crit_lower and humidity < crit_lower: + if crit_lower is not None and humidity < crit_lower: status = 2 levelstext = levelstext_lower - elif crit_upper and humidity >= crit_upper: + elif crit_upper is not None and humidity >= crit_upper: status = 2 levelstext = levelstext_upper - elif warn_lower and humidity < warn_lower: + elif warn_lower is not None and humidity < warn_lower: status = 1 levelstext = levelstext_lower - elif warn_upper and humidity >= warn_upper: + elif warn_upper is not None and humidity >= warn_upper: status = 1 levelstext = levelstext_upper

6 years, 4 months

← Newer
1
...
23
24
25
26
27
28
29
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018