Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 2645b8d37ae072bb94ccd4bc9769e2a3f5e7aa99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2645b8d37ae072… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 26 15:53:51 2019 +0200 Activate shiftTooManyBitsSigned again. Change-Id: Ia1de5cc64b9e13e6b9dc22ad69188431cecd5e18 --- livestatus/src/cppcheck-suppressions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index 7db40ac..1343c8c 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -1,7 +1,6 @@ missingIncludeSystem passedByValue redundantAssignment -shiftTooManyBitsSigned uninitMemberVar unmatchedSuppression unusedFunction

5 years, 1 month

Fixed nexus URL.

by Sven Panne

Module: check_mk Branch: master Commit: e3507cf6357a9537225495b299ff63819291a210 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3507cf6357a95… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 6 09:37:55 2019 +0200 Fixed nexus URL. Change-Id: I758cf17efa6da3f3b69001f5c7c820c7696a8e1e --- Pipfile | 2 +- Pipfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Pipfile b/Pipfile index e660f5e..72dacd4 100644 --- a/Pipfile +++ b/Pipfile @@ -24,7 +24,7 @@ pdbpp = "*" freezegun = "*" # We have to use a snapshot, a version which works for us has not been released yet. :-/ # Workaround: We need to upload the Archive and cannot use it from our Git due to a Pipenv bug -compiledb = {file = "http://nexus:8081/repository/archives/compiledb-1604e14.tar.gz"} +compiledb = {file = "http://nexus.lan.tribe29.com:8081/repository/archives/compiledb-1604e14.tar…"} [packages] setuptools_scm = "==3.1.0" diff --git a/Pipfile.lock b/Pipfile.lock index 0096c14..d9e5a3d 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "9f48473f7896536f450eb385c041745c6028ebadb0ae29b516b1b678d4e0fc7b" + "sha256": "b8a3467e46635ee27af0010d167beb32a3aa7e647b9ae5a2480e44f4c10d2475" }, "pipfile-spec": 6, "requires": { @@ -1010,7 +1010,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version == '2.7'", + "markers": "python_version < '3'", "version": "==1.5" }, "backports.ssl-match-hostname": { @@ -1054,7 +1054,7 @@ "version": "==3.0.4" }, "compiledb": { - "file": "http://nexus:8081/repository/archives/compiledb-1604e14.tar.gz" + "file": "http://nexus.lan.tribe29.com:8081/repository/archives/compiledb-1604e14.tar…" }, "configparser": { "hashes": [ @@ -1156,7 +1156,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { @@ -1280,11 +1280,11 @@ }, "mock": { "hashes": [ - "sha256:5eda46efb363128828d6fd2bf8d16f6ebb66f5b543b9f7f8f4eb224c5cb503fe", - "sha256:d659f8ef8810ff4c3f8f973d113a05d291a08ab0f7ed17bd60887983b93a0f9a" + "sha256:21a2c07af3bbc4a77f9d14ac18fcc1782e8e7ea363df718740cdeaf61995b5e7", + "sha256:7868db2825a1563578869d4a011a036503a2f1d60f9ff9dd1e3205cd6e25fcec" ], "markers": "python_version < '3.0'", - "version": "==3.0.3" + "version": "==3.0.4" }, "mockldap": { "hashes": [

5 years, 1 month

quick and simple refactoring

by Sergey Kipnis

Module: check_mk Branch: master Commit: 4569586bb420c2c8b248d367478c0137250b51eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4569586bb420c2… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Tue Apr 30 18:46:42 2019 +0200 quick and simple refactoring - bool UpdateCacheOnSuccess replaced with enum class - StartTypes correctly reworked in enum class AppType - removed annoying trace Change-Id: I52a52266d8a15375af01efd74903222e29f56ce1 --- agents/wnx/include/tools/_xlog.h | 7 +++-- agents/wnx/src/common/cfg_info.h | 3 +- agents/wnx/src/engine/cfg.cpp | 2 +- agents/wnx/src/engine/cfg.h | 4 +-- agents/wnx/src/engine/logger.cpp | 7 +++-- agents/wnx/src/engine/on_start.cpp | 27 +++++++++--------- agents/wnx/src/engine/on_start.h | 19 +++++++------ agents/wnx/src/engine/provider_api.h | 3 +- agents/wnx/src/engine/realtime.cpp | 8 ++---- agents/wnx/src/engine/upgrade.cpp | 10 ++++--- agents/wnx/src/main/check_mk_service.cpp | 4 +-- agents/wnx/src/player/plugin_player.cpp | 8 ++---- .../src/providers/perf_counter/perf_counter.cpp | 2 +- agents/wnx/watest/test-cvt.cpp | 32 +++++++++++----------- agents/wnx/watest/test-install-auto.cpp | 4 +-- agents/wnx/watest/test-log.cpp | 2 +- agents/wnx/watest/test-mrpe.cpp | 4 +-- agents/wnx/watest/test-onlyfrom.cpp | 8 ++---- agents/wnx/watest/test-player.cpp | 23 +++++++--------- agents/wnx/watest/test-plugin.cpp | 20 ++++++-------- agents/wnx/watest/test-realtime.cpp | 11 ++++---- agents/wnx/watest/test-section_fileinfo.cpp | 6 ++-- agents/wnx/watest/test-section_ps.cpp | 11 +++----- agents/wnx/watest/test-section_wmi.cpp | 14 ++++------ agents/wnx/watest/test-spool.cpp | 2 +- agents/wnx/watest/test-winperf.cpp | 2 +- agents/wnx/watest/test-yaml.cpp | 18 ++++++------ agents/wnx/watest/watest.cpp | 20 ++++++-------- 28 files changed, 133 insertions(+), 148 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4569586bb4…

5 years, 1 month

7344 SEC Changing all setuid root binaries to use linux capabilities

by Lars Michelsen

Module: check_mk Branch: master Commit: cfbe8ba1b6e4a7749db55f777c213c866a54b9f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfbe8ba1b6e4a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 3 08:15:27 2019 +0200 7344 SEC Changing all setuid root binaries to use linux capabilities In Linux there is the option to give a binary a SETUID bit. This bit gives the processes created by the binary all privileges of the binary file owner. There is also a more advanced concept called "linux capabilities" which makes it possible to give these processes only a specific set of permissions. In past versions Check_MK used SETUID root binaries in several places for different reasons. <ul> <li>check_dhcp / check_icmp: Active check plugins which need this permission to be able to open their raw sockets for sending and receiving their packets.</li> <li>bin/mkeventd_open514: Open SNMP trap or sylog ports for receiving messages.</li> <li>lib/cmc/icmpsender / lib/cmc/icmpreceiver: CEE/CME only: Open raw sockets for sending and receiving packets.</li> </ul> SETUID root binaries are problematic in terms of security, because they could be used for getting root privileges in case an attacker finds an attackable security flaw in them. Once exploited the attacker would gain full root access on the Check_MK system. Because all of these binaries need the privilege for a very specific known reason, we have now removed the SETUID bit from these binaries and are now setting individual linux capabilities to them. The capabilities have the advantage that they don't give full root access to the processes created with the binary. Instead they give only a defined set of permissions. Change-Id: Idde9bdfb6e0446d655a85d616f563902fc290364 --- .werks/7344 | 38 ++++++++++++++++++++++++ bin/.f12 | 3 +- omd/Makefile | 8 +++-- omd/debian/postinst.in | 38 ++++++++++++------------ omd/distros/CENTOS_5.mk | 1 + omd/distros/CENTOS_6.mk | 1 + omd/distros/CENTOS_7.mk | 1 + omd/distros/DEBIAN_5.mk | 1 + omd/distros/DEBIAN_6.mk | 1 + omd/distros/DEBIAN_7.mk | 1 + omd/distros/DEBIAN_8.mk | 1 + omd/distros/DEBIAN_9.mk | 1 + omd/distros/SLES_11SP1.mk | 1 + omd/distros/SLES_11SP2.mk | 1 + omd/distros/SLES_11SP3.mk | 1 + omd/distros/SLES_11SP4.mk | 1 + omd/distros/SLES_12.mk | 1 + omd/distros/SLES_12SP1.mk | 1 + omd/distros/SLES_12SP2.mk | 1 + omd/distros/SLES_12SP3.mk | 1 + omd/distros/SLES_12SP4.mk | 1 + omd/distros/SLES_15.mk | 1 + omd/distros/UBUNTU_12.04.mk | 1 + omd/distros/UBUNTU_13.04.mk | 1 + omd/distros/UBUNTU_14.04.mk | 1 + omd/distros/UBUNTU_15.04.mk | 1 + omd/distros/UBUNTU_16.04.mk | 1 + omd/distros/UBUNTU_16.10.mk | 1 + omd/distros/UBUNTU_17.04.mk | 1 + omd/distros/UBUNTU_17.10.mk | 1 + omd/distros/UBUNTU_18.04.mk | 1 + omd/distros/UBUNTU_18.10.mk | 1 + omd/omd.spec.in | 15 ++++++---- omd/packages/cma/post-install | 26 +++++++++++++++-- scripts/setup.sh | 3 +- tests/integration/omd/test_setuid_binaries.py | 42 +++++++++++++++++---------- 36 files changed, 155 insertions(+), 46 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cfbe8ba1b6…

5 years, 1 month

Fix negated host tag transformation

by Lars Michelsen

Module: check_mk Branch: master Commit: 11feb114602b7f2262a46e72d7cfdabf9f8d8c45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11feb114602b7f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat May 4 21:27:02 2019 +0200 Fix negated host tag transformation Change-Id: I455602f1d63df8c3a7cb0d971bfaedd2b1413a2c --- cmk/utils/rulesets/tuple_rulesets.py | 2 +- tests/unit/cmk/utils/rulesets/test_rule_matcher.py | 8 ++++++++ .../cmk/utils/rulesets/test_ruleset_transformer.py | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/cmk/utils/rulesets/tuple_rulesets.py b/cmk/utils/rulesets/tuple_rulesets.py index 2da2cc1..710ae80 100644 --- a/cmk/utils/rulesets/tuple_rulesets.py +++ b/cmk/utils/rulesets/tuple_rulesets.py @@ -212,7 +212,7 @@ class RulesetToDictTransformer(object): tag_group_id = self._tag_groups[tag_id] - conditions["host_tags." + tag_group_id] = {"ne": tag_id} if negate else tag_id + conditions["host_tags." + tag_group_id] = {"$ne": tag_id} if negate else tag_id return conditions diff --git a/tests/unit/cmk/utils/rulesets/test_rule_matcher.py b/tests/unit/cmk/utils/rulesets/test_rule_matcher.py index 1f988ce..a687b0c 100644 --- a/tests/unit/cmk/utils/rulesets/test_rule_matcher.py +++ b/tests/unit/cmk/utils/rulesets/test_rule_matcher.py @@ -82,6 +82,14 @@ NESTED_FIELD_MATCHES = [ "$ne": "test" }}, [HOST_PROD]), Case({"tags.not_existing": "test"}, []), + Case({ + "tags.not_existing": { + "$ne": "test" + }, + "tags.not_existing2": { + "$ne": "test" + }, + }, [HOST_PROD, HOST_TEST]), ] COMPARISON_MATCHES = [ diff --git a/tests/unit/cmk/utils/rulesets/test_ruleset_transformer.py b/tests/unit/cmk/utils/rulesets/test_ruleset_transformer.py index 3723d2d..739e652 100644 --- a/tests/unit/cmk/utils/rulesets/test_ruleset_transformer.py +++ b/tests/unit/cmk/utils/rulesets/test_ruleset_transformer.py @@ -270,6 +270,23 @@ BINARY_HOST_RULESET = [ }, }, ), + Case( + ident="not_equal_tag_match", + is_service=False, + is_binary=True, + old=(['!TAG1', '!TAG2'], tuple_rulesets.ALL_HOSTS), + new={ + "value": True, + "condition": { + 'host_tags.TG1': { + '$ne': 'TAG1' + }, + 'host_tags.TG2': { + '$ne': 'TAG2' + }, + }, + }, + ), ] NON_BINARY_SERVICE_RULESET = [ @@ -441,6 +458,7 @@ BINARY_SERVICE_RULESET = [ TAG_TO_GROUP_MAP = { "TAG1": "TG1", + "TAG2": "TG2", "tag": "tg_group1", "specs": "tg_group2", }

5 years, 1 month

Cleanup unit test omd_site mocking

by Lars Michelsen

Module: check_mk Branch: master Commit: eceeb822761ca483a0bcc9be744b4a35dacde493 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eceeb822761ca4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat May 4 15:15:49 2019 +0200 Cleanup unit test omd_site mocking Change-Id: I667a0dc308054239abede1cd38ec4f69d8532090 --- cmk/gui/config.py | 5 +++-- cmk/gui/plugins/wato/notifications.py | 19 ++++++++----------- tests/unit/cmk/gui/conftest.py | 4 ---- tests/unit/conftest.py | 6 ++++++ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index 2d27b4e..d8f2be5 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -33,6 +33,7 @@ from typing import Callable, Union, Tuple, Dict # pylint: disable=unused-import import six from pathlib2 import Path +import cmk import cmk.gui.utils as utils import cmk.gui.tags import cmk.gui.i18n @@ -1082,11 +1083,11 @@ def extend_user_modified_tag_groups(host_tags): def omd_site(): - return os.environ["OMD_SITE"] + return cmk.omd_site() def url_prefix(): - return "/%s/" % omd_site() + return "/%s/" % cmk.omd_site() use_siteicons = False diff --git a/cmk/gui/plugins/wato/notifications.py b/cmk/gui/plugins/wato/notifications.py index d46a622..840268d 100644 --- a/cmk/gui/plugins/wato/notifications.py +++ b/cmk/gui/plugins/wato/notifications.py @@ -85,6 +85,10 @@ def transform_forth_html_mail_url_prefix(p): return ("manual", v) +def local_site_url(): + return "http://" + socket.gethostname() + "/" + config.omd_site() + "check_mk/", + + @notification_parameter_registry.register class NotificationParameterMail(NotificationParameter): @property @@ -276,9 +280,7 @@ class NotificationParameterSlack(NotificationParameter): regex_error=_("The URL must begin with <tt>http</tt> or " "<tt>https</tt> and end with <tt>/check_mk/</tt>."), size=64, - default_value="http://" + socket.gethostname() + "/" + - (config.omd_site() and config.omd_site() + "/" or - "") + "check_mk/", + default_value=local_site_url, )), ], ), @@ -344,9 +346,7 @@ class NotificationParameterVictorOPS(NotificationParameter): regex_error=_("The URL must begin with <tt>http</tt> or " "<tt>https</tt> and end with <tt>/check_mk/</tt>."), size=64, - default_value="http://" + socket.gethostname() + "/" + - (config.omd_site() and config.omd_site() + "/" or - "") + "check_mk/", + default_value=local_site_url, )), ], ), @@ -404,9 +404,7 @@ class NotificationParameterPagerDuty(NotificationParameter): regex_error=_("The URL must begin with <tt>http</tt> or " "<tt>https</tt> and end with <tt>/check_mk/</tt>."), size=64, - default_value="http://" + socket.gethostname() + "/" + - (config.omd_site() and config.omd_site() + "/" or - "") + "check_mk/", + default_value=local_site_url, )), ], ), @@ -1058,8 +1056,7 @@ class NotificationParameterPushover(NotificationParameter): regex_error=_("The URL must begin with <tt>http</tt> or " "<tt>https</tt> and end with <tt>/check_mk/</tt>."), size=64, - default_value="http://" + socket.gethostname() + "/" + - (config.omd_site() and config.omd_site() + "/" or "") + "check_mk/", + default_value=local_site_url, )), ( "proxy_url", diff --git a/tests/unit/cmk/gui/conftest.py b/tests/unit/cmk/gui/conftest.py index 636150a..2fa1b29 100644 --- a/tests/unit/cmk/gui/conftest.py +++ b/tests/unit/cmk/gui/conftest.py @@ -1,7 +1,6 @@ # pylint: disable=redefined-outer-name import pytest # type: ignore -import _pytest # type: ignore from werkzeug.test import create_environ from pathlib2 import Path @@ -12,9 +11,6 @@ import cmk.gui.htmllib as htmllib from cmk.gui.http import Request, Response from cmk.gui.globals import html, current_app -monkeypatch = _pytest.monkeypatch.MonkeyPatch() -monkeypatch.setattr(config, "omd_site", lambda: "NO_SITE") - # TODO: Better make our application available? class DummyApplication(object): diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 81f51ba..290d9c9 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -1,5 +1,11 @@ import socket import pytest # type: ignore +import cmk + + +(a)pytest.fixture(autouse=True) +def patch_omd_site(monkeypatch): + monkeypatch.setattr(cmk, "omd_site", lambda: "NO_SITE") # Unit tests should not be executed in site.

5 years, 1 month

Better use precomputed tags from HostConfig object

by Lars Michelsen

Module: check_mk Branch: master Commit: eadbfb4c0fe4e58bd788d6384a0eb39d70c8d833 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eadbfb4c0fe4e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun May 5 13:22:53 2019 +0200 Better use precomputed tags from HostConfig object Change-Id: I7646c5488b54e9f4d928f585d7c3bb9c13d48e78 --- cmk_base/core_config.py | 2 +- cmk_base/dump_host.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index ec5d159..48883f4 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -375,7 +375,7 @@ def get_host_attributes(hostname, config_cache): # "__TAG_" instead. We may deprecate this is one day. attrs["_TAGS"] = " ".join(sorted(config_cache.get_host_config(hostname).tags)) - attrs.update(_get_tag_attributes(config_cache.tags_of_host(hostname), "TAG")) + attrs.update(_get_tag_attributes(host_config.tag_groups, "TAG")) attrs.update(_get_tag_attributes(host_config.labels, "LABEL")) attrs.update(_get_tag_attributes(host_config.label_sources, "LABELSOURCE")) diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index 342cb69..73606e8 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -77,9 +77,7 @@ def dump_host(hostname): (addresses if addresses is not None else "No IP") + "\n") tag_template = tty.bold + "[" + tty.normal + "%s" + tty.bold + "]" + tty.normal - tags = [ - (tag_template % ":".join(t)) for t in sorted(config_cache.tags_of_host(hostname).items()) - ] + tags = [(tag_template % ":".join(t)) for t in sorted(host_config.tag_groups.items())] console.output(tty.yellow + "Tags: " + tty.normal + ", ".join(tags) + "\n") # TODO: Clean this up once cluster parent handling has been moved to HostConfig if host_config.is_cluster:

5 years, 1 month

Cleanup test config: Only append tags in case there are some set

by Lars Michelsen

Module: check_mk Branch: master Commit: 453cd7b2455b71ad7652f64fecf8ff59a2efe106 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=453cd7b2455b71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun May 5 13:26:12 2019 +0200 Cleanup test config: Only append tags in case there are some set Change-Id: Id75b97fd30ed0aece243665b926cc2988a08d478 --- tests/testlib/base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/testlib/base.py b/tests/testlib/base.py index d31bc4b..41b01c1 100644 --- a/tests/testlib/base.py +++ b/tests/testlib/base.py @@ -19,7 +19,8 @@ class Scenario(object): if tags is None: tags = [] - self.config["all_hosts"].append("%s|%s" % (hostname, "|".join(tags))) + name_with_tags = hostname if not tags else "%s|%s" % (hostname, "|".join(tags)) + self.config["all_hosts"].append(name_with_tags) self.config["host_paths"][hostname] = folder #self.config["host_tags"][hostname] = tags return self @@ -29,7 +30,7 @@ class Scenario(object): tags = [] if nodes is None: nodes = [] - name_with_tags = "%s|%s" % (hostname, "|".join(tags)) + name_with_tags = hostname if not tags else "%s|%s" % (hostname, "|".join(tags)) self.config["clusters"][name_with_tags] = nodes self.config["host_paths"][hostname] = folder #self.config["host_tags"][hostname] = tags

5 years, 1 month

Simplify _filter_active_hosts a bit: Move duplicate handling to call sites

by Lars Michelsen

Module: check_mk Branch: master Commit: b9bf94e19078f44733f3bbaf132f8ea8039e444e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9bf94e19078f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun May 5 19:36:39 2019 +0200 Simplify _filter_active_hosts a bit: Move duplicate handling to call sites Change-Id: I7202e5396766564b468a2885e86f7477c121c56c --- cmk_base/config.py | 55 +++++++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 63b7307..fb52726 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -35,7 +35,7 @@ import py_compile import struct import sys import itertools -from typing import Set, Text, Any, Callable, Dict, List, Tuple, Union, Optional # pylint: disable=unused-import +from typing import Iterable, Set, Text, Any, Callable, Dict, List, Tuple, Union, Optional # pylint: disable=unused-import import six @@ -622,7 +622,7 @@ def strip_tags(tagged_hostlist): # This function should only be used during duplicate host check! It has to work like # all_active_hosts() but with the difference that duplicates are not removed. def _all_active_hosts_with_duplicates(): - # type: () -> Set[str] + # type: () -> List[str] # Only available with CEE if "shadow_hosts" in globals(): shadow_host_entries = shadow_hosts.keys() @@ -632,40 +632,34 @@ def _all_active_hosts_with_duplicates(): config_cache = get_config_cache() return _filter_active_hosts(config_cache, strip_tags(all_hosts) \ + strip_tags(clusters.keys()) \ - + strip_tags(shadow_host_entries), keep_duplicates=True) + + strip_tags(shadow_host_entries)) -def _filter_active_hosts(config_cache, hostlist, keep_offline_hosts=False, keep_duplicates=False): +def _filter_active_hosts(config_cache, hostlist, keep_offline_hosts=False): + # type: (ConfigCache, Iterable[str], bool) -> List[str] """Returns a set of active hosts for this site""" - if only_hosts is None and distributed_wato_site is None: - active_hosts = hostlist + if only_hosts is None: + if distributed_wato_site is None: + return list(hostlist) - elif only_hosts is None: - active_hosts = [ + return [ hostname for hostname in hostlist if _host_is_member_of_site(config_cache, hostname, distributed_wato_site) ] - elif distributed_wato_site is None: + if distributed_wato_site is None: if keep_offline_hosts: - active_hosts = hostlist - else: - active_hosts = [ - hostname for hostname in hostlist - if config_cache.in_binary_hostlist(hostname, only_hosts) - ] - - else: - active_hosts = [ + return list(hostlist) + return [ hostname for hostname in hostlist - if (keep_offline_hosts or config_cache.in_binary_hostlist(hostname, only_hosts)) and - _host_is_member_of_site(config_cache, hostname, distributed_wato_site) + if config_cache.in_binary_hostlist(hostname, only_hosts) ] - if keep_duplicates: - return active_hosts - - return set(active_hosts) + return [ + hostname for hostname in hostlist + if (keep_offline_hosts or config_cache.in_binary_hostlist(hostname, only_hosts)) and + _host_is_member_of_site(config_cache, hostname, distributed_wato_site) + ] def _host_is_member_of_site(config_cache, hostname, site): @@ -700,10 +694,11 @@ def all_offline_hosts(): # type: () -> Set[str] config_cache = get_config_cache() - hostlist = _filter_active_hosts( - config_cache, - config_cache.all_configured_realhosts().union(config_cache.all_configured_clusters()), - keep_offline_hosts=True) + hostlist = set( + _filter_active_hosts( + config_cache, + config_cache.all_configured_realhosts().union(config_cache.all_configured_clusters()), + keep_offline_hosts=True)) return set([ hostname for hostname in hostlist @@ -3510,7 +3505,7 @@ class ConfigCache(object): def _get_all_active_realhosts(self): # type: () -> Set[str] - return _filter_active_hosts(self, self._all_configured_realhosts) + return set(_filter_active_hosts(self, self._all_configured_realhosts)) def all_configured_realhosts(self): # type: () -> Set[str] @@ -3560,7 +3555,7 @@ class ConfigCache(object): def _get_all_active_clusters(self): # type: () -> Set[str] - return _filter_active_hosts(self, self.all_configured_clusters()) + return set(_filter_active_hosts(self, self.all_configured_clusters())) def all_configured_clusters(self): # type: () -> Set[str]

5 years, 1 month

Minor cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 3cd414e4830a1ccb92c542663910ff748c1258b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cd414e4830a1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun May 5 19:31:54 2019 +0200 Minor cleanups Change-Id: I27df0a54fec59b882b3dd7f654a6fa457b7e1063 --- cmk_base/config.py | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index dec2944..63b7307 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -668,6 +668,15 @@ def _filter_active_hosts(config_cache, hostlist, keep_offline_hosts=False, keep_ return set(active_hosts) +def _host_is_member_of_site(config_cache, hostname, site): + # type: (ConfigCache, str, str) -> bool + for tag in config_cache.get_host_config(hostname).tags: + if tag.startswith("site:"): + return site == tag[5:] + # hosts without a site: tag belong to all sites + return True + + def duplicate_hosts(): # type: () -> List[str] seen_hostnames = set() # type: Set[str] @@ -714,28 +723,6 @@ def all_configured_offline_hosts(): #. -# .--Hosts---------------------------------------------------------------. -# | _ _ _ | -# | | | | | ___ ___| |_ ___ | -# | | |_| |/ _ \/ __| __/ __| | -# | | _ | (_) \__ \ |_\__ \ | -# | |_| |_|\___/|___/\__|___/ | -# | | -# +----------------------------------------------------------------------+ -# | Helper functions for dealing with hosts. | -# '----------------------------------------------------------------------' - - -def _host_is_member_of_site(config_cache, hostname, site): - # type: (ConfigCache, str, str) -> bool - for tag in config_cache.get_host_config(hostname).tags: - if tag.startswith("site:"): - return site == tag[5:] - # hosts without a site: tag belong to all sites - return True - - -#. # .--Services------------------------------------------------------------. # | ____ _ | # | / ___| ___ _ ____ _(_) ___ ___ ___ | @@ -2221,8 +2208,8 @@ class HostConfig(object): self.nodes = self._config_cache.nodes_of(hostname) # TODO: Rename self.tags to self.tag_list and self.tag_groups to self.tags - self.tags = self._config_cache.tag_list_of_host(self.hostname) - self.tag_groups = host_tags.get(hostname, {}) + self.tags = self._config_cache.tag_list_of_host(hostname) + self.tag_groups = self._config_cache.tags_of_host(hostname) self.labels = self._get_host_labels() self.label_sources = self._get_host_label_sources() self.ruleset_match_object = self._get_ruleset_match_object()

5 years, 1 month

← Newer
1
...
22
23
24
25
26
27
28
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2019