Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 999f53b1f8d1fd2f41222d0b88ab500997606654 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=999f53b1f8d1fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 28 08:24:57 2019 +0100 Fix deprecation warning in test Change-Id: I07e39ecca7af23f3d01cc5c3dc605142844409de --- tests/unit/checks/test_f5_bigip_conns.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/checks/test_f5_bigip_conns.py b/tests/unit/checks/test_f5_bigip_conns.py index 94e5061..fe0c0ea 100644 --- a/tests/unit/checks/test_f5_bigip_conns.py +++ b/tests/unit/checks/test_f5_bigip_conns.py @@ -51,5 +51,5 @@ def test_get_conn_rate_params(check_manager, config, result): "connections to use fixed levels."))]) def test_get_conn_rate_params_exception(check_manager, config, exception_msg): check = check_manager.get_check("f5_bigip_conns") - with pytest.raises(ValueError, message=exception_msg): + with pytest.raises(ValueError, match=exception_msg): check.context["get_conn_rate_params"](config)

5 years, 8 months

Fix new unit test sorting issue

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d1044cd52c6e6bd668e32e5323ce50c6b9957c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d1044cd52c6e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 25 11:32:18 2019 +0100 Fix new unit test sorting issue Change-Id: I799f7d289946b9075761972c6f3c979e77671352 --- tests/unit/cmk/gui/test_visuals.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/cmk/gui/test_visuals.py b/tests/unit/cmk/gui/test_visuals.py index 795ea3f..2844d52 100644 --- a/tests/unit/cmk/gui/test_visuals.py +++ b/tests/unit/cmk/gui/test_visuals.py @@ -3413,8 +3413,8 @@ def test_registered_filters(load_plugins): assert filt.description == spec["comment"] assert filt.sort_index == spec["sort_index"] assert filt.info == spec["info"] - assert filt.link_columns == spec["link_columns"] - assert filt.htmlvars == spec["htmlvars"] + assert sorted(filt.link_columns) == sorted(spec["link_columns"]) + assert sorted(filt.htmlvars) == sorted(spec["htmlvars"]) if "column" in spec: assert filt.column == spec["column"]

5 years, 8 months

Fixed double escaped user sync job link

by Lars Michelsen

Module: check_mk Branch: master Commit: b1cfb342cd6beb9003ca88147fc579f7334d125c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1cfb342cd6beb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jan 26 22:06:46 2019 +0100 Fixed double escaped user sync job link Change-Id: I35417607ca6dcb27df540759f22d77fd5567d352 --- cmk/gui/wato/pages/users.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmk/gui/wato/pages/users.py b/cmk/gui/wato/pages/users.py index 7b7da8d..dc812ef 100644 --- a/cmk/gui/wato/pages/users.py +++ b/cmk/gui/wato/pages/users.py @@ -173,7 +173,8 @@ class ModeUsers(WatoMode): elif self._job_snapshot.is_running(): # Still running - html.message(_("User synchronization currently running: %s") % self._job_details_link()) + html.message( + HTML(_("User synchronization currently running: ")) + self._job_details_link()) url = html.makeuri([]) html.immediate_browser_redirect(2, url) @@ -186,7 +187,8 @@ class ModeUsers(WatoMode): elif not self._job_snapshot.acknowledged_by() and self._job_snapshot.has_exception(): # Finished, but not OK - show info message with links to details html.show_warning( - _("Last user synchronization ran into an exception: %s") % self._job_details_link()) + HTML(_("Last user synchronization ran into an exception: ")) + + self._job_details_link()) self._show_user_list()

5 years, 8 months

6874 FIX mkbench: fixed searched command in processes

by Marcel Schulte

Module: check_mk Branch: master Commit: 933559d30bb0445dbfdc14a3f01c63a8dfccbedb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=933559d30bb044… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Jan 23 17:10:19 2019 +0100 6874 FIX mkbench: fixed searched command in processes In script ~/bin/mkbench the helper processes where still searched for old commands. Because of this the script never run successfully. This has been fixed now. Change-Id: Ice1fc47e656b34fd801e55644618606264e307dc --- .werks/6874 | 10 ++++++++++ bin/mkbench | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/6874 b/.werks/6874 new file mode 100644 index 0000000..ac0b9fa --- /dev/null +++ b/.werks/6874 @@ -0,0 +1,10 @@ +Title: mkbench: fixed searched command in processes +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1548259583 +Class: fix + +In script ~/bin/mkbench the helper processes where still searched for old commands. Because of this the script never run successfully. This has been fixed now. diff --git a/bin/mkbench b/bin/mkbench index 63b86f5..d9ade8d 100755 --- a/bin/mkbench +++ b/bin/mkbench @@ -2854,8 +2854,7 @@ class TestAgentBasedStandardHosts(TestCase): try: matched_pids = subprocess.check_output( - ["pgrep", "-u", - site_id(), "-f", "python.*check_mk.py --keepalive$"]).split("\n") + ["pgrep", "-u", site_id(), "-f", "python.*cmk --keepalive$"]).split("\n") except subprocess.CalledProcessError, e: self._test.error(" Found no helper yet (%s)" % e.returncode) continue

5 years, 8 months

mk_jolokia: prepare for more import errors

by Moritz Kiemer

Module: check_mk Branch: master Commit: d5ba773713077e696e92fc3ea77662ccd9fa2087 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5ba773713077e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jan 25 14:19:07 2019 +0100 mk_jolokia: prepare for more import errors Change-Id: I62c6b527969d5336960ea9087ded4a3685580b1f --- agents/plugins/mk_jolokia.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 738fceb..d086965 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -34,14 +34,17 @@ import copy from httplib import HTTPConnection, HTTPSConnection try: - from simplejson import json -except ImportError: try: - import json + from simplejson import json except ImportError: - sys.stdout.write("<<<jolokia_info>>>\n") - sys.stdout.write("Error: Missing JSON library for Agent Plugin mk_jolokia\n") - exit() + import json +except ImportError as import_error: + sys.stdout.write( + "<<<jolokia_info>>>\n" + "Error: mk_jolokia requires either the json or simplejson library\n" + "Please either use a Python version that contains the json library or install the" + " simplejson library on the monitored system.") + sys.exit(1) VERBOSE = '--verbose' in sys.argv DEBUG = '--debug' in sys.argv

5 years, 8 months

Migrated special agent register_rule() calls to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 18a79652e191531ff75a885a3dff73355900cfb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18a79652e19153… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 24 17:09:43 2019 +0100 Migrated special agent register_rule() calls to plugin registry CMK-1572 Change-Id: Icbca4a5496714c527ecc4e677ff0dacf8fbd04c9 --- cmk/gui/plugins/wato/datasource_programs.py | 2698 +++++++++++++++------------ 1 file changed, 1533 insertions(+), 1165 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=18a79652e1…

5 years, 8 months

Initial version with rewritten config.py and multiprocessing

by Andreas Boesl

Module: check_mk Branch: master Commit: 8b3857d7a7a0e344f0ffa273f6e30ce0c89b10ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b3857d7a7a0e3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 17 17:11:38 2019 +0100 Initial version with rewritten config.py and multiprocessing Change-Id: I50385d7f4ac85c2f8db2744a4b9a2d34f3311df6 --- cmk_base/automations/check_mk.py | 14 +- cmk_base/check_table.py | 52 +- cmk_base/checking.py | 7 +- cmk_base/config.py | 978 ++++++++++++++++++--------- cmk_base/core_nagios.py | 4 +- cmk_base/data_sources/abstract.py | 1 + cmk_base/data_sources/host_sections.py | 3 +- cmk_base/data_sources/programs.py | 2 +- cmk_base/discovery.py | 20 +- cmk_base/dump_host.py | 5 +- cmk_base/modes/__init__.py | 3 +- cmk_base/modes/check_mk.py | 3 +- tests/unit/checks/checktestlib.py | 64 +- tests/unit/checks/generictests/run.py | 4 +- tests/unit/checks/test_df_check.py | 9 +- tests/unit/cmk/gui/watolib/test_rulespecs.py | 2 +- tests/unit/cmk/gui/watolib/test_watolib.py | 1 + tests/unit/cmk_base/conftest.py | 10 + tests/unit/cmk_base/test_checks.py | 172 +++-- tests/unit/cmk_base/test_config.py | 16 +- tests/unit/cmk_base/test_rulesets.py | 19 +- 21 files changed, 904 insertions(+), 485 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8b3857d7a7…

5 years, 8 months

Minor folderpath fixes for hosts specified in conf.d

by Andreas Boesl

Module: check_mk Branch: master Commit: 5a14ffc087ed4745e38565875f9cebd666df8bfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a14ffc087ed47… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 24 13:35:12 2019 +0100 Minor folderpath fixes for hosts specified in conf.d Change-Id: I051ecb81b39a8da8fdac3b62b31887951cdf40c2 --- cmk_base/config.py | 12 ++++++++---- tests/unit/cmk_base/test_checks.py | 2 +- tests/unit/cmk_base/test_config.py | 4 ++-- tests/unit/cmk_base/test_rulesets.py | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index a7ed32d..fd2df7f 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2884,15 +2884,18 @@ class ConfigCache(object): 1.0 * len(self._all_processed_hosts) / len(used_groups)) def _initialize_host_lookup(self): + for hostname in self._all_configured_hosts: + dirname_of_host = os.path.dirname(host_paths[hostname]) + if dirname_of_host[-1] != "/": + dirname_of_host += "/" + self._host_paths[hostname] = dirname_of_host + + # Determine hosts within folders dirnames = [ x[0][len(cmk.utils.paths.check_mk_config_dir):] + "/" for x in os.walk(cmk.utils.paths.check_mk_config_dir) ] - for hostname in self._all_configured_hosts: - self._host_paths[hostname] = os.path.dirname(host_paths[hostname]) + "/" - - # Determine hosts within folders for dirname in dirnames: for hostname in self._all_configured_hosts: if self._host_paths[hostname].startswith(dirname): @@ -2975,6 +2978,7 @@ class ConfigCache(object): tags_set_without_folder = tags_set - rule_path_set if rule_path_set: + # More than one dynamic folder in one rule is simply wrong.. rule_path = list(rule_path_set)[0] else: rule_path = "/+" diff --git a/tests/unit/cmk_base/test_checks.py b/tests/unit/cmk_base/test_checks.py index aaf1c45..84039ad 100644 --- a/tests/unit/cmk_base/test_checks.py +++ b/tests/unit/cmk_base/test_checks.py @@ -63,7 +63,7 @@ def test_do_status_data_inventory_for(monkeypatch, result, ruleset): config.load_default_config() monkeypatch.setattr(config, "all_hosts", ["abc"]) - monkeypatch.setattr(config, "host_paths", {"abc": ""}) + monkeypatch.setattr(config, "host_paths", {"abc": "/"}) monkeypatch.setattr(config, "active_checks", { "cmk_inv": ruleset, }) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 830521c..d1c3a14 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -57,7 +57,7 @@ def test_is_no_ip_host(monkeypatch, hostname, tags, result): ]) def test_is_ipv6_primary_host(monkeypatch, hostname, tags, result, ruleset): monkeypatch.setattr(config, "all_hosts", ["%s|%s" % (hostname, "|".join(tags))]) - monkeypatch.setattr(config, "host_paths", {hostname: ""}) + monkeypatch.setattr(config, "host_paths", {hostname: "/"}) monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) monkeypatch.setattr(config, "primary_address_family", ruleset) @@ -204,5 +204,5 @@ def test_http_proxy(http_proxy, result, monkeypatch): def _setup_host(monkeypatch, hostname, tags): monkeypatch.setattr(config, "all_hosts", ["%s|%s" % (hostname, "|".join(tags))]) - monkeypatch.setattr(config, "host_paths", {hostname: ""}) + monkeypatch.setattr(config, "host_paths", {hostname: "/"}) diff --git a/tests/unit/cmk_base/test_rulesets.py b/tests/unit/cmk_base/test_rulesets.py index c6e6b09..b35f373 100644 --- a/tests/unit/cmk_base/test_rulesets.py +++ b/tests/unit/cmk_base/test_rulesets.py @@ -24,7 +24,7 @@ def clear_config_caches(monkeypatch): def test_service_extra_conf(monkeypatch): import cmk_base.config as config monkeypatch.setattr(config, "all_hosts", ["host1|tag1|tag2", "host2|tag1"]) - monkeypatch.setattr(config, "host_paths", {"host1": "", "host2": ""}) + monkeypatch.setattr(config, "host_paths", {"host1": "/", "host2": "/"}) monkeypatch.setattr(config, "clusters", {}) config.get_config_cache().initialize() @@ -68,7 +68,7 @@ def test_all_matching_hosts(monkeypatch): monkeypatch.setattr(config, "distributed_wato_site", "site1") monkeypatch.setattr(config, "all_hosts", ["host1|tag1|tag2", "host2|tag1", "host3|tag1|site:site2"]) - monkeypatch.setattr(config, "host_paths", {"host1": "", "host2": "", "host3": ""}) + monkeypatch.setattr(config, "host_paths", {"host1": "/", "host2": "/", "host3": "/"}) monkeypatch.setattr(config, "clusters", {}) config.get_config_cache().initialize()

5 years, 8 months

Refactored check parameter rules to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 248fd55a6025e1ca773b0f1be167d86bdabc60f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=248fd55a6025e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 24 17:27:49 2019 +0100 Refactored check parameter rules to plugin registry CMK-1572 Change-Id: Idef8298cab7c0a3268a81b3a7347abdc10ac4a3e --- cmk/gui/plugins/wato/__init__.py | 1 - .../wato/check_parameters/brocade_fcport.py | 134 +++---- cmk/gui/plugins/wato/check_parameters/diskstat.py | 59 ++-- .../plugins/wato/check_parameters/domino_tasks.py | 192 +++++----- cmk/gui/plugins/wato/check_parameters/ewon.py | 46 ++- .../wato/check_parameters/fileinfo-groups.py | 124 ++++--- .../plugins/wato/check_parameters/filesystem.py | 143 +++++--- .../plugins/wato/check_parameters/heartbeat_crm.py | 72 ++-- cmk/gui/plugins/wato/check_parameters/if.py | 391 ++++++++++++--------- cmk/gui/plugins/wato/check_parameters/ipmi.py | 82 +++-- .../plugins/wato/check_parameters/logwatch_ec.py | 333 ++++++++++-------- .../plugins/wato/check_parameters/mssql_backup.py | 47 ++- .../wato/check_parameters/mssql_counters_locks.py | 39 +- .../wato/check_parameters/mssql_transactionlogs.py | 51 +-- .../plugins/wato/check_parameters/msx_queues.py | 72 ++-- cmk/gui/plugins/wato/check_parameters/multipath.py | 58 +-- cmk/gui/plugins/wato/check_parameters/ps.py | 156 ++++---- cmk/gui/plugins/wato/check_parameters/services.py | 105 +++--- .../wato/check_parameters/solaris_services.py | 100 +++--- .../wato/check_parameters/systemd_services.py | 67 ++-- cmk/gui/plugins/wato/check_parameters/unsorted.py | 281 +++++++++------ .../plugins/wato/check_parameters/vnx_quotas.py | 85 +++-- .../wato/check_parameters/win_dhcp_pools.py | 47 ++- 23 files changed, 1542 insertions(+), 1143 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=248fd55a60…

5 years, 8 months

Improved config generation performance when there are thousands of hosts AND folders

by Andreas Boesl

Module: check_mk Branch: master Commit: 0fd76b90fe56bd8e9e296e7c23481c9c9fd59c4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fd76b90fe56bd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 24 14:46:40 2019 +0100 Improved config generation performance when there are thousands of hosts AND folders Change-Id: Iba4ec828bccefc7adca662b78a185800c428848b --- cmk_base/config.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index fd2df7f..5d834b5 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -438,7 +438,6 @@ class PackedConfig(object): "service_groups", "host_groups", "contacts", - "host_paths", "timeperiods", "extra_service_conf", "extra_nagios_conf", @@ -2892,16 +2891,10 @@ class ConfigCache(object): # Determine hosts within folders dirnames = [ - x[0][len(cmk.utils.paths.check_mk_config_dir):] + "/" + x[0][len(cmk.utils.paths.check_mk_config_dir):] + "/+" for x in os.walk(cmk.utils.paths.check_mk_config_dir) ] - - for dirname in dirnames: - for hostname in self._all_configured_hosts: - if self._host_paths[hostname].startswith(dirname): - self._folder_host_lookup.setdefault(dirname + "+", set()).add(hostname) - - self._folder_path_set = set(self._folder_host_lookup.keys()) + self._folder_path_set = set(dirnames) # Determine hosttags without folder tag for hostname in self._all_configured_hosts: @@ -2919,6 +2912,18 @@ class ConfigCache(object): self._hosts_grouped_by_tags.setdefault(group_ref, set()).add(hostname) self._host_grouped_ref[hostname] = group_ref + def get_hosts_within_folder(self, folder_path): + if folder_path not in self._folder_host_lookup: + hosts_in_folder = set() + # Strip off "+" + folder_path_tmp = folder_path[:-1] + for hostname in self._all_configured_hosts: + if self._host_paths[hostname].startswith(folder_path_tmp): + hosts_in_folder.add(hostname) + self._folder_host_lookup[folder_path] = hosts_in_folder + return hosts_in_folder + return self._folder_host_lookup[folder_path] + def get_autochecks_of(self, hostname, world): try: return self._autochecks_cache[world][hostname] @@ -2985,8 +2990,7 @@ class ConfigCache(object): # Thin out the valid hosts further. If the rule is located in a folder # we only need the intersection of the folders hosts and the previously determined valid_hosts - if rule_path in self._folder_host_lookup: - valid_hosts = self._folder_host_lookup[rule_path].intersection(valid_hosts) + valid_hosts = self.get_hosts_within_folder(rule_path).intersection(valid_hosts) # Contains matched hosts

5 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019