Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Take piggyback persisted sections into account during checking phase

by Simon Betz

Module: check_mk Branch: master Commit: a1eefdd809fb81fafdbd89b246a3697525ff49ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1eefdd809fb81… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 23 09:58:29 2019 +0100 Take piggyback persisted sections into account during checking phase Change-Id: Id602ee4bf51adc6805c8cb1546018430ef6fe005 --- cmk_base/config.py | 6 ++++-- cmk_base/data_sources/__init__.py | 7 +++++++ cmk_base/data_sources/abstract.py | 4 +++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 9c800a0..169ad13 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -855,8 +855,10 @@ def is_ping_host(hostname): def is_agent_host(hostname): import cmk_base.piggyback as piggyback - return is_tcp_host(hostname) or piggyback.has_piggyback_raw_data(piggyback_max_cachefile_age, - hostname) + import cmk_base.data_sources as data_sources + return (is_tcp_host(hostname) or + piggyback.has_piggyback_raw_data(piggyback_max_cachefile_age, hostname) or + data_sources.has_persisted_piggyback_agent_sections(hostname)) def is_dual_host(hostname): diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 5f1a1e6..cba1b0e 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -91,6 +91,13 @@ 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__() diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 3f6a6ff..135f8b5 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -408,12 +408,14 @@ class DataSource(object): # | of sections that are not provided on each query. | # '----------------------------------------------------------------------' + def has_persisted_agent_sections(self): + return os.path.exists(self._persisted_sections_file_path()) + def _store_persisted_sections(self, persisted_sections): if not persisted_sections: return file_path = self._persisted_sections_file_path() - try: os.makedirs(os.path.dirname(file_path)) except OSError as e:

5 years, 8 months

6939 FIX Improve agent updater start script compatibility on Solaris

by Andreas Umbreit

Module: check_mk Branch: master Commit: 22b9ca22d447a9db2a4a0bce56f23e19bec268cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22b9ca22d447a9… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Wed Jan 23 11:52:06 2019 +0100 6939 FIX Improve agent updater start script compatibility on Solaris The agent updater start script (located at /usr/bin/cmk-update-agent) is now compatible to older shells like the default sh on Solaris 10. Please note that you still need a python 2.7 installation and corresponding packages "requests" and "pyOpenSSL" in order to run the agent updater on Solaris. You can obtain these software packages e.g. via the "OpenCSW" project using the "pkutil" tool. Change-Id: I09a9b88ec7da7122a8cd1881457325b4ac65d3a1 --- .werks/6939 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/6939 b/.werks/6939 new file mode 100644 index 0000000..652a895 --- /dev/null +++ b/.werks/6939 @@ -0,0 +1,16 @@ +Title: Improve agent updater start script compatibility on Solaris +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1548240334 +Class: fix + +The agent updater start script (located at /usr/bin/cmk-update-agent) +is now compatible to older shells like the default sh on Solaris 10. + +Please note that you still need a python 2.7 installation and corresponding +packages "requests" and "pyOpenSSL" in order to run the agent updater +on Solaris. You can obtain these software packages e.g. via the +"OpenCSW" project using the "pkutil" tool.

5 years, 8 months

CMK-1439: Add Werk 6935

by Andreas Umbreit

Module: check_mk Branch: master Commit: 11ea6a9977168088c41aa86404b9c98b04e6191a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11ea6a99771680… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Wed Jan 23 11:43:21 2019 +0100 CMK-1439: Add Werk 6935 Change-Id: I4d55b8950f138735a4e6378e0011d21bd5c1df4f --- .werks/6935 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.werks/6935 b/.werks/6935 new file mode 100644 index 0000000..442b858 --- /dev/null +++ b/.werks/6935 @@ -0,0 +1,19 @@ +Title: Improvements in Solaris Agent packages +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1544712266 + +This werk introduces some improvements in the postinstall- and postuninstall-routines +for Solaris agent packages that come from the agent bakery: +<ul> +<li>Properly remove the installed inetd service. This has been done incompletely +before, which could lead to problems on reinstallation.</li> +<li>simplified syntax in order to avoid errors like <code>/var/sadm/pkg/check-mk-agent/install/postinstall: !: not found</code> +on some Solaris systems.</li> +<li>some improvements in timing and robustness.</li> +</ul>

5 years, 8 months

mk_jolokia: include keys w/o default

by Moritz Kiemer

Module: check_mk Branch: master Commit: 480a34220775def428d02b078e993aa2aa06e5ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=480a34220775de… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 23 15:11:34 2019 +0100 mk_jolokia: include keys w/o default Change-Id: I2403358e69ac1fe22f1e23ac91779cf7f1e84a56 --- agents/plugins/mk_jolokia.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index e2a2524..4dafc96 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -549,12 +549,12 @@ def yield_configured_instances(): if os.path.exists(conffile): execfile(conffile, {}, custom_config) - # Compute list of instances to monitor. If the user has defined - # instances in his configuration, we will use this (a list - # of dicts). - instances = custom_config.pop("instances", [{}]) - for inst in instances: - yield {k: inst.get(k, custom_config[k]) for k in custom_config} + # Generate list of instances to monitor. If the user has defined + # instances in his configuration, we will use this (a list of dicts). + individual_configs = custom_config.pop("instances", [{}]) + for cfg in individual_configs: + keys = set(cfg.keys() + custom_config.keys()) + yield {k: cfg.get(k, custom_config[k]) for k in keys} def main(configs_iterable=None):

5 years, 8 months

mk_jolokia: minor changes to declutter follow-up (2)

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5ed7442f8e02630703419db3aec27f84d016fc58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ed7442f8e0263… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 23 07:50:32 2019 +0100 mk_jolokia: minor changes to declutter follow-up (2) Moved a couple of functions around. The only function actually modified is '_get_post_data'. Change-Id: Ib0b748d61153f267d6ad97e68ac295ae25dc7945 --- agents/plugins/mk_jolokia.py | 175 +++++++++++++++++++++---------------------- 1 file changed, 85 insertions(+), 90 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 37d1554..f3c4156 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -169,67 +169,6 @@ class SkipInstance(RuntimeError): pass -class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler): - """ - sends basic authentication with the first request, - before the server even asks for it - """ - - def http_request(self, req): - url = req.get_full_url() - realm = None - user, pwd = self.passwd.find_user_password(realm, url) - if pwd: - raw = "%s:%s" % (user, pwd) - auth = 'Basic %s' % base64.b64encode(raw).strip() - req.add_unredirected_header(self.auth_header, auth) - return req - - https_request = http_request - - -class HTTPSValidatingConnection(HTTPSConnection): - def __init__(self, host, ca_file, key_file, cert_file): - HTTPSConnection.__init__(self, host, key_file=key_file, cert_file=cert_file) - self.__ca_file = ca_file - self.__key_file = key_file - self.__cert_file = cert_file - - def connect(self): - HTTPConnection.connect(self) - if self.__ca_file: - self.sock = ssl.wrap_socket( - self.sock, - keyfile=self.key_file, - certfile=self.cert_file, - ca_certs=self.__ca_file, - cert_reqs=ssl.CERT_REQUIRED) - else: - self.sock = ssl.wrap_socket( - self.sock, - keyfile=self.key_file, - certfile=self.cert_file, - ca_certs=self.__ca_file, - cert_reqs=ssl.CERT_NONE) - - -class HTTPSAuthHandler(urllib2.HTTPSHandler): - def __init__(self, ca_file, key, cert): - urllib2.HTTPSHandler.__init__(self) - self.__ca_file = ca_file - self.__key = key - self.__cert = cert - - def https_open(self, req): - # do_open expects a class as the first parameter but getConnection will act - # as a facotry function - return self.do_open(self.get_connection, req) - - def get_connection(self, host, _timeout): - return HTTPSValidatingConnection( - host, ca_file=self.__ca_file, key_file=self.__key, cert_file=self.__cert) - - def write_section(name, iterable): sys.stdout.write('<<<%s:sep(0)>>>\n' % name) for line in iterable: @@ -249,24 +188,16 @@ def cached(function): return cached_function -def _get_post_data(path, service_url, service_user, service_password, function): - segments = path.split("/") - - data = { - "type": function.upper(), - "mbean": segments[0], - "attribute": segments[1], - "target": { - "url": service_url, - }, - } - if len(segments) > 2: - data["path"] = segments[2] - if service_user: - data["target"]["user"] = service_user - data["target"]["password"] = service_password +def sanitize_config(config): - return json.dumps(data) + if not config["instance"]: + config["instance"] = str(config["port"]) + config["instance"] = config["instance"].replace(" ", "_") + + if config.get("server") == "use fqdn": + config["server"] = socket.getfqdn() + + return config def fetch_url(request_url, post_data=None): @@ -282,6 +213,21 @@ def fetch_url(request_url, post_data=None): return json_data +def _get_post_data(path, service_url, service_user, service_password, function): + segments = path.strip("/").split("/") + data = {"mbean": segments[0], "attribute": segments[1]} + if len(segments) > 2: + data["path"] = segments[2] + data["type"] = function + + data["target"] = {"url": service_url} + if service_user: + data["target"]["user"] = service_user + data["target"]["password"] = service_password + + return json.dumps(data) + + def fetch_var(protocol, server, port, @@ -452,6 +398,67 @@ def query_instance(inst): write_section('jolokia_generic', generate_values(inst, inst.get("custom_vars"))) +class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler): + """ + sends basic authentication with the first request, + before the server even asks for it + """ + + def http_request(self, req): + url = req.get_full_url() + realm = None + user, pwd = self.passwd.find_user_password(realm, url) + if pwd: + raw = "%s:%s" % (user, pwd) + auth = 'Basic %s' % base64.b64encode(raw).strip() + req.add_unredirected_header(self.auth_header, auth) + return req + + https_request = http_request + + +class HTTPSValidatingConnection(HTTPSConnection): + def __init__(self, host, ca_file, key_file, cert_file): + HTTPSConnection.__init__(self, host, key_file=key_file, cert_file=cert_file) + self.__ca_file = ca_file + self.__key_file = key_file + self.__cert_file = cert_file + + def connect(self): + HTTPConnection.connect(self) + if self.__ca_file: + self.sock = ssl.wrap_socket( + self.sock, + keyfile=self.key_file, + certfile=self.cert_file, + ca_certs=self.__ca_file, + cert_reqs=ssl.CERT_REQUIRED) + else: + self.sock = ssl.wrap_socket( + self.sock, + keyfile=self.key_file, + certfile=self.cert_file, + ca_certs=self.__ca_file, + cert_reqs=ssl.CERT_NONE) + + +class HTTPSAuthHandler(urllib2.HTTPSHandler): + def __init__(self, ca_file, key, cert): + urllib2.HTTPSHandler.__init__(self) + self.__ca_file = ca_file + self.__key = key + self.__cert = cert + + def https_open(self, req): + # do_open expects a class as the first parameter but getConnection will act + # as a facotry function + return self.do_open(self.get_connection, req) + + def get_connection(self, host, _timeout): + return HTTPSValidatingConnection( + host, ca_file=self.__ca_file, key_file=self.__key, cert_file=self.__cert) + + def prepare_http_opener(inst): # Prepare user/password authentication via HTTP Auth password_mngr = urllib2.HTTPPasswordMgrWithDefaultRealm() @@ -527,18 +534,6 @@ def yield_configured_instances(): yield {k: inst.get(k, custom_config[k]) for k in custom_config} -def sanitize_config(config): - - if not config["instance"]: - config["instance"] = str(config["port"]) - config["instance"] = config["instance"].replace(" ", "_") - - if config.get("server") == "use fqdn": - config["server"] = socket.getfqdn() - - return config - - def main(configs_iterable=None): if configs_iterable is None: configs_iterable = yield_configured_instances()

5 years, 8 months

mk_jolokia: input validation to fail early

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6036c73df07859214bbd4595e079b56b06812269 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6036c73df07859… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 23 14:42:24 2019 +0100 mk_jolokia: input validation to fail early Change-Id: I1fc0e73d3d0145cadc06792297ccf6ea82f64ca1 --- agents/plugins/mk_jolokia.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index f3c4156..e2a2524 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -190,10 +190,33 @@ def cached(function): def sanitize_config(config): - if not config["instance"]: + instance = config.get("instance") + err_msg = "%s in configuration" + if instance: + err_msg += " for %s" % instance + + required_keys = {"protocol", "server", "port", "suburi"} + auth_mode = config.get("mode") + if auth_mode in ("digest", "basic", "basic_preemtive"): + required_keys |= {"user", "password"} + elif auth_mode == "https": + required_keys |= {"client_cert", "client_key"} + if config.get("service_url") is not None and config.get("service_user") is not None: + required_keys.add("service_password") + missing_keys = required_keys - set(config.keys()) + if missing_keys: + raise ValueError(err_msg % ("Missing keys " % ", ".join(missing_keys))) + + if not instance: config["instance"] = str(config["port"]) config["instance"] = config["instance"].replace(" ", "_") + # port must be (or look like) an integer + try: + config["port"] = int(config["port"]) + except ValueError: + raise ValueError(err_msg % ("Invalid port %r" % config["port"])) + if config.get("server") == "use fqdn": config["server"] = socket.getfqdn()

5 years, 8 months

Refactoring: Moved rules from unsorted.py to matching modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 5ff6ec61331ce0bbcebd9b87a2bce14dc5366b03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ff6ec61331ce0… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Jan 18 12:45:02 2019 +0100 Refactoring: Moved rules from unsorted.py to matching modules (CMK-1393) Change-Id: I2f1ad301539a82ca1dc57239dc376adc2853d405 --- cmk/gui/plugins/wato/check_parameters/diskstat.py | 26 + .../plugins/wato/check_parameters/domino_tasks.py | 94 ++++ .../wato/check_parameters/fileinfo-groups.py | 58 ++ .../plugins/wato/check_parameters/filesystem.py | 72 ++- .../plugins/wato/check_parameters/heartbeat_crm.py | 33 ++ cmk/gui/plugins/wato/check_parameters/if.py | 111 ++++ .../plugins/wato/check_parameters/logwatch_ec.py | 155 ++++++ .../plugins/wato/check_parameters/msx_queues.py | 32 ++ cmk/gui/plugins/wato/check_parameters/multipath.py | 25 + cmk/gui/plugins/wato/check_parameters/unsorted.py | 605 --------------------- 10 files changed, 605 insertions(+), 606 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5ff6ec6133…

5 years, 8 months

7054 agent_vsphere, esx_vsphere_hostsystem.multipath: use new API endpoint

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 10a10c3152aae43eaf30f9e2afdfddbf331f9f71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10a10c3152aae4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Dec 20 11:33:57 2018 +0100 7054 agent_vsphere, esx_vsphere_hostsystem.multipath: use new API endpoint For ESX versions above or equal to 6.5 the API endpoint "multipathState" does not deliver sufficient data for the subcheck esx_vsphere_hostsystem.multipath which may lead to a wrong output of the subcheck. Therefore, the subcheck now uses the "multipathInfo" API endpoint instead. For ESX versions below 6.5 which already use the ID of a LUN as an item no further actions are necessary. For new ESX version which use an item like e.g. "L0 physical" a service rediscovery is necessary. After the rediscovery new ESX versions will use the ID of a LUN as an item as well. CMK-1362 Change-Id: I24d0bd6d16b1cbbced475f50706b770f2ee8392a --- .werks/7054 | 18 ++ agents/special/agent_vsphere | 21 +- checks/esx_vsphere_hostsystem | 70 +------ .../esx_vsphere_hostsystem_55_regression.py | 60 ++++++ .../esx_vsphere_hostsystem_esx51_regression.py | 232 +-------------------- .../datasets/esx_vsphere_hostsystem_regression.py | 56 ++--- 6 files changed, 136 insertions(+), 321 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=10a10c3152…

5 years, 8 months

add pdbpp for improved debugging capabilities

by Florian Kromer

Module: check_mk Branch: master Commit: a4763b4dbc8fd363a1c9130637ef8f0c0586d647 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4763b4dbc8fd3… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Jan 23 15:00:03 2019 +0100 add pdbpp for improved debugging capabilities Change-Id: Ia5b4fc2399a9a82b92fa3f6177716fde15348631 --- Pipfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Pipfile b/Pipfile index 11b34a6..d3aba13 100644 --- a/Pipfile +++ b/Pipfile @@ -1,4 +1,5 @@ # ATTENTION: Most of this file is generated by omd/packages/python-modules/Makefile + [[source]] url = "https://pypi.python.org/simple" verify_ssl = true @@ -20,6 +21,7 @@ yapf = "*" docker = "*" mockldap = "*" isort = "*" +pdbpp = "*" [packages] setuptools_scm = "==3.1.0"

5 years, 8 months

Refactor cpu_utilization checks

by Óscar Nájera

Module: check_mk Branch: master Commit: e4353e1fd300784de843958571ffb67b35d94dae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4353e1fd30078… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Jan 21 17:18:05 2019 +0100 Refactor cpu_utilization checks - Implement cpu_info namedtuple This simplifies the identification of values in cpu_util_unix check - Unify single_core utilization to use total avg Rules - Unify checks outputs, update tests correspondingly - Unified lparstat check as a Unix check Change-Id: Iea9b14c7fe2eecdb348a81b81bb47d2aaa942f0e --- checks/cpu_util.include | 185 +++++++++++---------- checks/kernel | 8 +- checks/lparstat_aix | 6 +- checks/statgrab_cpu | 2 +- cmk_base/check_api.py | 10 +- .../generictests/datasets/azure_databases.py | 4 +- .../checks/generictests/datasets/azure_sites.py | 2 +- .../datasets/k8s_resources_regression.py | 4 +- .../datasets/lparstat_aix_1_regression.py | 62 +++---- .../datasets/lparstat_aix_2_regression.py | 8 +- .../datasets/lparstat_aix_regression.py | 78 ++++----- .../datasets/netapp_api_qtree_quota_regression.py | 6 +- .../generictests/datasets/vms_cpu_regression.py | 2 +- tests/unit/checks/generictests/datasets/zfsget.py | 10 +- tests/unit/checks/test_diskstat.py | 4 +- tests/unit/checks/test_kernel_check.py | 2 +- tests/unit/checks/test_statgrab_cpu_check.py | 8 +- 17 files changed, 201 insertions(+), 200 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e4353e1fd3…

5 years, 8 months

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