Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: ae650865e2fa591d86254b10255ef1e9f47acb1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae650865e2fa59… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 09:57:05 2019 +0200 mk_mongodb: isolate piggyback logic Change-Id: I862d37113bf74ab1c9bafbd7348c72e9313488b1 --- agents/plugins/mk_mongodb | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index b272559..b93d5ad 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -15,9 +15,22 @@ import os import pprint import sys import time +from contextlib import contextmanager import pymongo # pylint: disable=import-error +@contextmanager +def piggyback(info): + piggyhost = info.get("setName") if info else None + if piggyhost: + sys.stdout.write("<<<<%s>>>>\n" % piggyhost) + try: + yield + finally: + if piggyhost: + sys.stdout.write("<<<<>>>>\n") + + def section_instance(server_status): sys.stdout.write("<<<mongodb_instance:sep(9)>>>\n") sys.stdout.write("version\t%s\n" % server_status["version"]) @@ -68,11 +81,8 @@ def main(): if repl_info and not repl_info.get("ismaster"): return - if repl_info: - sys.stdout.write("<<<<%s>>>>\n" % repl_info["setName"]) - potentially_piggybacked_sections(client, server_status, repl_info) - if repl_info: - sys.stdout.write("<<<<>>>>\n") + with piggyback(repl_info): + potentially_piggybacked_sections(client, server_status, repl_info) def potentially_piggybacked_sections(client, server_status, repl_info):

5 years, 3 months

mk_mongodb: factor out piggybacked sections

by Moritz Kiemer

Module: check_mk Branch: master Commit: 29e934d0fe9edc0cfb4510faa1d5ee55d1aef2fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29e934d0fe9edc… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 08:44:47 2019 +0200 mk_mongodb: factor out piggybacked sections Change-Id: Ifb85226fd8d30cf567b9e6987c4c7acdf8fe7a75 --- agents/plugins/mk_mongodb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index ad88514..43351de 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -47,7 +47,7 @@ def section_flushing(server_status): sys.stdout.write("flushed %s\n" % flushing_info["flushes"]) -def main(): # pylint: disable=too-many-branches,too-many-locals +def main(): # might be implemented in the future.. host = None port = None @@ -64,10 +64,20 @@ def main(): # pylint: disable=too-many-branches,too-many-locals section_instance(server_status) repl_info = server_status.get("repl") + + if repl_info and not repl_info.get("ismaster"): + return + if repl_info: - if not repl_info.get("ismaster"): - sys.exit(0) sys.stdout.write("<<<<%s>>>>\n" % repl_info["setName"]) + potentially_piggybacked_sections(con, server_status, repl_info) + if repl_info: + sys.stdout.write("<<<<>>>>\n") + + +def potentially_piggybacked_sections(con, server_status, repl_info): + # pylint: disable=too-many-branches,too-many-locals + if repl_info: sys.stdout.write("<<<mongodb_replica:sep(9)>>>\n") sys.stdout.write("primary\t%s\n" % repl_info.get("primary")) sys.stdout.write("hosts\t%s\n" % " ".join(repl_info.get("hosts"))) @@ -198,8 +208,6 @@ def main(): # pylint: disable=too-many-branches,too-many-locals file(state_file, "w").write("%d" % get_timestamp(startup_warnings["log"][-1].split(".")[0])) - sys.stdout.write("<<<<>>>>\n") - if __name__ == "__main__": sys.exit(main())

5 years, 3 months

mk_mongodb: remove '.database_names()'

by Moritz Kiemer

Module: check_mk Branch: master Commit: 66b21e09ac953a36dabdf9548e7446ab67190ef5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66b21e09ac953a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 07:53:38 2019 +0200 mk_mongodb: remove '.database_names()' The database_names attribute was a method of a client instance - not of the top level module. Also it is deprecated, and used to return a list of database names. Change-Id: I06ce33d9e094fa6e5fa4f794e4a5d95cfb352f3f --- agents/plugins/mk_mongodb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index fc45b9a..473e82b 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -36,11 +36,6 @@ def main(): # pylint: disable=too-many-branches,too-many-locals try: con = pymongo.MongoClient(host, port, read_preference=pymongo.ReadPreference.SECONDARY) - try: - # pylint: disable=no-member - con = pymongo.database_names() - except Exception: # pylint: disable=broad-except - con = pymongo.MongoClient(None, None, read_preference=pymongo.ReadPreference.SECONDARY) # if user and passwd: # db = con["admin"]

5 years, 3 months

mk_mongodb: factor out instance section

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4eea335b0f0985869f07c6434bd915141183c937 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4eea335b0f0985… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 08:12:09 2019 +0200 mk_mongodb: factor out instance section Change-Id: I30a8e23aa12a3a031393dcc8391399762bb74321 --- agents/plugins/mk_mongodb | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 78b5ada..ad88514 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -18,6 +18,24 @@ import time import pymongo # pylint: disable=import-error +def section_instance(server_status): + sys.stdout.write("<<<mongodb_instance:sep(9)>>>\n") + sys.stdout.write("version\t%s\n" % server_status["version"]) + sys.stdout.write("pid\t%s\n" % server_status["pid"]) + repl_info = server_status.get("repl") + if not repl_info: + sys.stdout.write("mode\tSingle Instance\n") + return + if repl_info.get("ismaster"): + sys.stdout.write("mode\tPrimary\n") + return + if repl_info.get("secondary"): + sys.stdout.write("mode\tSecondary\n") + return + sys.stdout.write("mode\tArbiter\n") + sys.stdout.write("address\t%s\n" % repl_info["me"]) + + def section_flushing(server_status): # key is depricated for MongoDB 4.0 flushing_info = server_status.get("backgroundFlushing") @@ -43,23 +61,9 @@ def main(): # pylint: disable=too-many-branches,too-many-locals sys.stdout.write("error\tInstance is down\n") return - repl_info = server_status.get("repl") - - sys.stdout.write("<<<mongodb_instance:sep(9)>>>\n") - if not repl_info: - sys.stdout.write("mode\tSingle Instance\n") - else: - if repl_info.get("ismaster"): - sys.stdout.write("mode\tPrimary\n") - elif repl_info.get("secondary"): - sys.stdout.write("mode\tSecondary\n") - else: - sys.stdout.write("mode\tArbiter\n") - sys.stdout.write("address\t%s\n" % repl_info["me"]) - - sys.stdout.write("version\t%s\n" % server_status["version"]) - sys.stdout.write("pid\t%s\n" % server_status["pid"]) + section_instance(server_status) + repl_info = server_status.get("repl") if repl_info: if not repl_info.get("ismaster"): sys.exit(0)

5 years, 3 months

Cleanup piggyback computation

by Lars Michelsen

Module: check_mk Branch: master Commit: cbcb443957d6f5b4ef0a5c80d8b60f7acd69199d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbcb443957d6f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 08:02:35 2019 +0200 Cleanup piggyback computation * Cleanup circular dependency between DataSources computation of a host and the HostConfig class. * Directly use piggyback datasource in HostConfig.has_piggyback_data to reduce the dependencies * Cleanup duplicated logic Change-Id: I4662681c75d8c77ff4f923f7e9d6df9eb564680d --- cmk_base/config.py | 22 +++++++--------------- cmk_base/data_sources/__init__.py | 13 +++++-------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 8503ac9..71e8adb 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -846,18 +846,8 @@ def is_agent_host(hostname): if is_tcp_host(hostname): return True - tags = tag_list_of_host(hostname) - - if "piggyback" in tags: - is_piggyback_host = True - elif "no-piggyback" in tags: - is_piggyback_host = False - else: # Legacy automatic detection - import cmk_base.data_sources as data_sources - is_piggyback_host = piggyback.has_piggyback_raw_data(piggyback_max_cachefile_age, hostname) or \ - data_sources.has_persisted_piggyback_agent_sections(hostname) - - return is_piggyback_host + host_config = get_config_cache().get_host_config(hostname) + return host_config.is_piggyback_host def is_dual_host(hostname): @@ -2826,9 +2816,11 @@ class HostConfig(object): @property def has_piggyback_data(self): - import cmk_base.data_sources as data_sources - return piggyback.has_piggyback_raw_data(piggyback_max_cachefile_age, self.hostname) or \ - data_sources.has_persisted_piggyback_agent_sections(self.hostname) + if piggyback.has_piggyback_raw_data(piggyback_max_cachefile_age, self.hostname): + return True + + from cmk_base.data_sources.piggyback import PiggyBackDataSource + return PiggyBackDataSource(self.hostname, None).has_persisted_agent_sections() #. diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index b991f2e..a30a453 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -91,18 +91,15 @@ def _in_keepalive_mode(): # '----------------------------------------------------------------------' -def has_persisted_piggyback_agent_sections(hostname): - for source in DataSources(hostname, None).get_data_sources(): - if isinstance(source, PiggyBackDataSource) and source.has_persisted_agent_sections(): - return True - return False - - class DataSources(object): def __init__(self, hostname, ipaddress): super(DataSources, self).__init__() self._hostname = hostname self._ipaddress = ipaddress + + config_cache = config.get_config_cache() + self._host_config = config.HostConfig(config_cache, hostname) + self._initialize_data_sources() # Has currently no effect. The value possibly set during execution on the single data @@ -145,7 +142,7 @@ class DataSources(object): self._add_source(SNMPDataSource(self._hostname, self._ipaddress)) def _initialize_management_board_data_sources(self): - protocol = config.management_protocol_of(self._hostname) + protocol = self._host_config.management_protocol if protocol == "snmp": # TODO: Why not hand over management board IP address? self._add_source(SNMPManagementBoardDataSource(self._hostname, self._ipaddress))

5 years, 3 months

mk_pymongo: specifically except ConnectionFailure

by Moritz Kiemer

Module: check_mk Branch: master Commit: a12464dbe4231ce586654b411199a00ad242ddb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a12464dbe4231c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 08:02:28 2019 +0200 mk_pymongo: specifically except ConnectionFailure Change-Id: I1b672fc523a4b78082649a1bf8ff4359a94c21c1 --- agents/plugins/mk_mongodb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 473e82b..78b5ada 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -34,19 +34,14 @@ def main(): # pylint: disable=too-many-branches,too-many-locals host = None port = None + con = pymongo.MongoClient(host, port, read_preference=pymongo.ReadPreference.SECONDARY) try: - con = pymongo.MongoClient(host, port, read_preference=pymongo.ReadPreference.SECONDARY) - - # if user and passwd: - # db = con["admin"] - # if not db.authenticate(user, passwd): - # sys.exit("Username/Password incorrect") - + # connecting is lazy, it might fail only now server_status = con.admin.command("serverStatus") - except Exception: # pylint: disable=broad-except + except pymongo.errors.ConnectionFailure: sys.stdout.write("<<<mongodb_instance:sep(9)>>>\n") sys.stdout.write("error\tInstance is down\n") - sys.exit(0) + return repl_info = server_status.get("repl")

5 years, 3 months

Moved duplicated logic to HostConfig()

by Lars Michelsen

Module: check_mk Branch: master Commit: dc23709b2cc5df3b7661a3784540130b1443b93e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc23709b2cc5df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 08:54:35 2019 +0200 Moved duplicated logic to HostConfig() Next the call sites to the marked config.* functions should be cleaned up step by step. Change-Id: I5a79c299df6ec838cc7d6851550aa82564be546a --- cmk_base/config.py | 76 ++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 28a5d14..ceb037e 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -818,8 +818,9 @@ def parents_of(hostname): # If host is node of one or more clusters, return a list of the cluster host names. # If not, return an empty list. +# TODO: Replace call sites with HostConfig access and remove this def clusters_of(hostname): - return get_config_cache().clusters_of(hostname) + return get_config_cache().get_host_config(hostname).part_of_clusters # @@ -827,37 +828,39 @@ def clusters_of(hostname): # +# TODO: Replace call sites with HostConfig access and remove this def is_tcp_host(hostname): - return in_binary_hostlist(hostname, tcp_hosts) + return get_config_cache().get_host_config(hostname).is_tcp_host +# TODO: Replace call sites with HostConfig access and remove this def is_snmp_host(hostname): - return in_binary_hostlist(hostname, snmp_hosts) + return get_config_cache().get_host_config(hostname).is_snmp_host +# TODO: Replace call sites with HostConfig access and remove this def is_ping_host(hostname): return get_config_cache().get_host_config(hostname).is_ping_host -# Deprecated: Use HostConfig:is_agent_host instance instead +# TODO: Replace call sites with HostConfig access and remove this def is_agent_host(hostname): - if is_tcp_host(hostname): - return True - - host_config = get_config_cache().get_host_config(hostname) - return host_config.is_piggyback_host + return get_config_cache().get_host_config(hostname).is_agent_host +# TODO: Replace call sites with HostConfig access and remove this def is_dual_host(hostname): - return is_tcp_host(hostname) and is_snmp_host(hostname) + return get_config_cache().get_host_config(hostname).is_dual_host +# TODO: Replace call sites with HostConfig access and remove this def is_all_agents_host(hostname): - return "all-agents" in tag_list_of_host(hostname) + return get_config_cache().get_host_config(hostname).is_all_agents_host +# TODO: Replace call sites with HostConfig access and remove this def is_all_special_agents_host(hostname): - return "special-agents" in tag_list_of_host(hostname) + return get_config_cache().get_host_config(hostname).is_all_special_agents_host # @@ -865,45 +868,29 @@ def is_all_special_agents_host(hostname): # +# TODO: Replace call sites with HostConfig access and remove this def is_ipv6_primary(hostname): - """Whether or not the given host is configured to be monitored - primarily via IPv6.""" - dual_stack_host = is_ipv4v6_host(hostname) - return (not dual_stack_host and is_ipv6_host(hostname)) \ - or (dual_stack_host and _primary_ip_address_family_of(hostname) == "ipv6") - - -def _primary_ip_address_family_of(hostname): - rules = host_extra_conf(hostname, primary_address_family) - if rules: - return rules[0] - return "ipv4" + return get_config_cache().get_host_config(hostname).is_ipv6_primary +# TODO: Replace call sites with HostConfig access and remove this def is_ipv4v6_host(hostname): - tags = tag_list_of_host(hostname) - return "ip-v6" in tags and "ip-v4" in tags + return get_config_cache().get_host_config(hostname).is_ipv4v6_host +# TODO: Replace call sites with HostConfig access and remove this def is_ipv6_host(hostname): - return "ip-v6" in tag_list_of_host(hostname) + return get_config_cache().get_host_config(hostname).is_ipv6_host +# TODO: Replace call sites with HostConfig access and remove this def is_ipv4_host(hostname): - """Whether or not the given host is configured to be monitored via IPv4. - This is the case when it is set to be explicit IPv4 or implicit - (when host is not an IPv6 host and not a "No IP" host)""" - tags = tag_list_of_host(hostname) - - if "ip-v4" in tags: - return True - - return "ip-v6" not in tags and "no-ip" not in tags + return get_config_cache().get_host_config(hostname).is_ipv4_host +# TODO: Replace call sites with HostConfig access and remove this def is_no_ip_host(hostname): - """Whether or not the given host is configured not to be monitored via IP""" - return "no-ip" in tag_list_of_host(hostname) + return get_config_cache().get_host_config(hostname).is_no_ip_host # @@ -2796,14 +2783,19 @@ class HostConfig(object): self.is_all_special_agents_host = "special-agents" in tags # IP addresses + # Whether or not the given host is configured not to be monitored via IP self.is_no_ip_host = "no-ip" in tags self.is_ipv6_host = "ip-v6" in tags + # Whether or not the given host is configured to be monitored via IPv4. + # This is the case when it is set to be explicit IPv4 or implicit (when + # host is not an IPv6 host and not a "No IP" host) self.is_ipv4_host = "ip-v4" in tags or (not self.is_ipv6_host and not self.is_no_ip_host) self.is_ipv4v6_host = "ip-v6" in tags and "ip-v4" in tags + # Whether or not the given host is configured to be monitored primarily via IPv6 self.is_ipv6_primary = (not self.is_ipv4v6_host and self.is_ipv6_host) \ - or (self.is_ipv4v6_host and _primary_ip_address_family_of(hostname) == "ipv6") + or (self.is_ipv4v6_host and self._primary_ip_address_family_of() == "ipv6") @property def has_piggyback_data(self): @@ -2813,6 +2805,12 @@ class HostConfig(object): from cmk_base.data_sources.piggyback import PiggyBackDataSource return PiggyBackDataSource(self.hostname, None).has_persisted_agent_sections() + def _primary_ip_address_family_of(self): + rules = self._config_cache.host_extra_conf(self.hostname, primary_address_family) + if rules: + return rules[0] + return "ipv4" + #. # .--Configuration Cache-------------------------------------------------.

5 years, 3 months

mk_mongodb: avoid deprecated method

by Moritz Kiemer

Module: check_mk Branch: master Commit: 928cf173f2ddd60fd641561583d3640c76f6a9db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=928cf173f2ddd6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 09:11:40 2019 +0200 mk_mongodb: avoid deprecated method Change-Id: I2385525a912498f368a49fdc554e79d7ddf0d8af --- agents/plugins/mk_mongodb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 43351de..248cdd6 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -93,14 +93,18 @@ def potentially_piggybacked_sections(con, server_status, repl_info): sys.stdout.write("<<<mongodb_connections>>>\n") sys.stdout.write("%s\n" % "\n".join("%s %s" % x for x in server_status["connections"].items())) - databases = {x: {} for x in con.database_names()} - - for name in databases.keys(): - databases[name]["collections"] = con[name].collection_names() - databases[name]["stats"] = con[name].command("dbstats") + try: + databases = {x: {} for x in con.list_database_names()} + except AttributeError: # pymongo < 3.6 + databases = {x: {} for x in con.database_names()} + + for name in databases: + database = con[name] + databases[name]["collections"] = database.collection_names() + databases[name]["stats"] = database.command("dbstats") databases[name]["collstats"] = {} for collection in databases[name]["collections"]: - databases[name]["collstats"][collection] = con[name].command("collstats", collection) + databases[name]["collstats"][collection] = database.command("collstats", collection) sys.stdout.write("<<<mongodb_chunks>>>\n") col = con.config.chunks

5 years, 3 months

Cleaned up implicit dependency of HostConfig to ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: 640bdf2156ad179f854c658e9d7978b99b4b79f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=640bdf2156ad17… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 20:59:32 2019 +0200 Cleaned up implicit dependency of HostConfig to ConfigCache Change-Id: I78c06266cc774ebc1664417bbd1f560588cd80f0 --- cmk_base/config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index f43a361..8503ac9 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2775,11 +2775,12 @@ cmk_base.cleanup.register_cleanup(check_api_utils.reset_hostname) class HostConfig(object): - def __init__(self, hostname): + def __init__(self, config_cache, hostname): + # type: (ConfigCache, str) -> None super(HostConfig, self).__init__() self.hostname = hostname - self._config_cache = get_config_cache() + self._config_cache = config_cache self.is_cluster = is_cluster(hostname) self.part_of_clusters = self._config_cache.clusters_of(hostname) @@ -2939,7 +2940,7 @@ class ConfigCache(object): if host_config: return host_config - host_config = self._host_configs[hostname] = HostConfig(hostname) + host_config = self._host_configs[hostname] = HostConfig(self, hostname) return host_config def _collect_hosttags(self):

5 years, 3 months

Move some management board configs to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: dc1a940a81db5f93eeb2feea55c7b77730a44a3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc1a940a81db5f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 08:27:39 2019 +0200 Move some management board configs to HostConfig Simplified management board tests on the way. Change-Id: If527bc1653a11defe80bdf459c630fefc653075d --- cmk_base/config.py | 37 ++++----- tests/integration/cmk_base/test_mgmt_board.py | 75 ++++++++++------- tests/unit/cmk_base/test_checks.py | 115 ++++++++++++++------------ 3 files changed, 120 insertions(+), 107 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dc1a940a81…

5 years, 3 months

← Newer
1
...
46
47
48
49
50
51
52
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019