Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

agent_kubernetes, k8s_service_info: HW/SW inventory for services

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 0c7864b20bbf8dc2bcb7536c5787441ee492a24e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c7864b20bbf8d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Mar 28 13:47:44 2019 +0100 agent_kubernetes, k8s_service_info: HW/SW inventory for services Kubernetes services are now provided as piggyback data by the agent_kubernetes. The inventory plugin k8s_service_info shows some general information about a service in the HW/SW inventory. Change-Id: If9f5e4e077d033ce914ed27ab780a0681778a9a6 --- cmk/gui/plugins/views/inventory.py | 6 +++ cmk/gui/plugins/wato/datasource_programs.py | 3 +- cmk/special_agents/agent_kubernetes.py | 81 +++++++++++++++++++++++++++++ inventory/k8s_service_info | 41 +++++++++++++++ 4 files changed, 130 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 24edb67..8aa0629 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -1115,6 +1115,12 @@ inventory_displayhints.update({ ".software.applications.kubernetes.pod_info.host_ip": {"title": _("Host IP")}, ".software.applications.kubernetes.pod_info.pod_ip": {"title": _("Pod IP")}, ".software.applications.kubernetes.pod_info.qos_class": {"title": _("QOS class")}, + ".software.applications.kubernetes.service_info.": { + "title": _("Service"), + }, + ".software.applications.kubernetes.service_info.type": {"title": _("Type")}, + ".software.applications.kubernetes.service_info.cluster_ip": {"title": _("Cluster IP")}, + ".software.applications.kubernetes.service_info.load_balancer_ip": {"title": _("Load Balancer IP")}, ".software.applications.citrix.": {"title": _("Citrix")}, ".software.applications.citrix.controller.": {"title": _("Controller")}, ".software.applications.citrix.controller.controller_version": { diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index a35b3d1..e74b0b6 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -150,8 +150,9 @@ class RulespecSpecialAgentsKubernetes(HostRulespec): ListChoice( choices=[ ("nodes", _("Nodes")), - ("pods", _("Pods")), + ("services", _("Services")), ("deployments", _("Deployments")), + ("pods", _("Pods")), ], default_value=[ "nodes", diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index c40ffb5..641cec6 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -251,6 +251,67 @@ class ComponentStatus(Metadata): return [{'type': c.type, 'status': c.status} for c in self._conditions] +class Service(Metadata): + def __init__(self, service): + super(Service, self).__init__(service.metadata) + + spec = service.spec + if spec: + # For details refer to: + # https://github.com/kubernetes-client/python/blob/master/kubernetes/docs/V1S… + + # type may be: ExternalName, ClusterIP, NodePort, and LoadBalancer + self._type = spec.type + self._selector = spec.selector if spec.selector else {} + # cluster_ip may be: None (headless service), "" (no IP), or a str (valid IP) + self._cluster_ip = spec.cluster_ip + # only applies to type LoadBalancer + self._load_balancer_ip = spec.load_balancer_ip + self._ports = spec.ports if spec.ports else [] + else: + self._type_ = None + self._selector = {} + self._cluster_ip = "" + self._load_balancer_ip = "" + self._ports = [] + + status = service.status + if status and status.load_balancer and status.load_balancer.ingress: + self._ingress = { + { + # for ingress points that are DNS based (typically AWS load-balancers) + 'hostname': ingress.hostname, + # for ingress points that are IP based (typically GCE or OpenStack load-balancers) + 'ip': ingress.ip + } for ingress in status.load_balancer.ingress + } + + @property + def info(self): + return { + 'type': self._type, + 'selector': self._selector, + 'cluster_ip': self._cluster_ip, + 'load_balancer_ip': self._load_balancer_ip, + } + + @property + def selector(self): + return self._selector + + @property + def ports(self): + # port is the only field that is not optional + return { + port.port: { + 'name': port.name, + 'protocol': port.protocol, + 'target_port': port.target_port, + 'node_port': port.node_port, + } for port in self._ports + } + + class Deployment(Metadata): # TODO: include pods of the deployment? def __init__(self, deployment): @@ -543,6 +604,14 @@ class ComponentStatusList(K8sList[ComponentStatus]): return {status.name: status.conditions for status in self if status.name} +class ServiceList(K8sList[Service]): + def infos(self): + return {service.name: service.info for service in self} + + def ports(self): + return {service.name: service.ports for service in self} + + class DeploymentList(K8sList[Deployment]): def replicas(self): return {deployment.name: deployment.replicas for deployment in self} @@ -804,6 +873,7 @@ class ApiData(object): pvs = core_api.list_persistent_volume() pvcs = core_api.list_persistent_volume_claim_for_all_namespaces() pods = core_api.list_pod_for_all_namespaces() + services = core_api.list_service_for_all_namespaces() deployments = apps_api.list_deployment_for_all_namespaces() logging.debug('Assigning collected data') @@ -818,6 +888,7 @@ class ApiData(object): self.persistent_volume_claims = PersistentVolumeClaimList( map(PersistentVolumeClaim, pvcs.items)) self.pods = PodList(map(Pod, pods.items)) + self.services = ServiceList(map(Service, services.items)) self.deployments = DeploymentList(map(Deployment, deployments.items)) pods_custom_metrics = { @@ -920,6 +991,14 @@ class ApiData(object): g.join('k8s_pod_info', self.pods.info()) return '\n'.join(g.output()) + def service_sections(self): + logging.info('Output service sections') + g = Group() + g.join('labels', self.services.labels()) + g.join('k8s_service_info', self.services.infos()) + g.join('k8s_service_ports', self.services.ports()) + return '\n'.join(g.output()) + def deployment_sections(self): logging.info('Output node sections') g = Group() @@ -973,6 +1052,8 @@ def main(args=None): print(api_data.pod_sections()) if 'deployments' in arguments.infos: print(api_data.deployment_sections()) + if 'services' in arguments.infos: + print(api_data.service_sections()) except Exception as e: if arguments.debug: raise diff --git a/inventory/k8s_service_info b/inventory/k8s_service_info new file mode 100644 index 0000000..e38639e --- /dev/null +++ b/inventory/k8s_service_info @@ -0,0 +1,41 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2019 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def inv_k8s_service_info(info, inventory_tree): + parsed = parse_k8s(info) + + path = "software.applications.kubernetes.service_info." + inv_node = inventory_tree.get_dict(path) + + for key, value in sorted(parsed.iteritems()): + inv_node[key] = value + + +inv_info['k8s_service_info'] = { + 'inv_function': inv_k8s_service_info, + 'includes': ['k8s.include'], +} \ No newline at end of file

5 years, 6 months

k8s_selector: inventory plugin to show selectors

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 460ebc0534e90d92704936a88b9e38c467f6fba7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=460ebc0534e90d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 29 09:59:58 2019 +0100 k8s_selector: inventory plugin to show selectors Change-Id: Iab0a82f7277fd1125e3a6c356557e99ccce8158e --- cmk/gui/plugins/views/inventory.py | 3 +++ cmk/special_agents/agent_kubernetes.py | 5 ++++- inventory/k8s_selector | 41 ++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 8aa0629..100ed0d 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -1121,6 +1121,9 @@ inventory_displayhints.update({ ".software.applications.kubernetes.service_info.type": {"title": _("Type")}, ".software.applications.kubernetes.service_info.cluster_ip": {"title": _("Cluster IP")}, ".software.applications.kubernetes.service_info.load_balancer_ip": {"title": _("Load Balancer IP")}, + ".software.applications.kubernetes.selector.": { + "title": _("Selectors"), + }, ".software.applications.citrix.": {"title": _("Citrix")}, ".software.applications.citrix.controller.": {"title": _("Controller")}, ".software.applications.citrix.controller.controller_version": { diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index aa93b47..122f601 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -290,7 +290,6 @@ class Service(Metadata): def info(self): return { 'type': self._type, - 'selector': self._selector, 'cluster_ip': self._cluster_ip, 'load_balancer_ip': self._load_balancer_ip, } @@ -608,6 +607,9 @@ class ServiceList(K8sList[Service]): def infos(self): return {service.name: service.info for service in self} + def selector(self): + return {service.name: service.selector for service in self} + def ports(self): return {service.name: service.ports for service in self} @@ -1002,6 +1004,7 @@ class ApiData(object): logging.info('Output service sections') g = Group() g.join('labels', self.services.labels()) + g.join('k8s_selector', self.services.selector()) g.join('k8s_service_info', self.services.infos()) g.join('k8s_service_ports', self.services.ports()) return '\n'.join(g.output(piggyback_prefix="service_")) diff --git a/inventory/k8s_selector b/inventory/k8s_selector new file mode 100644 index 0000000..76e219f --- /dev/null +++ b/inventory/k8s_selector @@ -0,0 +1,41 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2019 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def inv_k8s_selector(info, inventory_tree): + parsed = parse_k8s(info) + + path = "software.applications.kubernetes.selector." + inv_node = inventory_tree.get_dict(path) + + for key, value in sorted(parsed.iteritems()): + inv_node[key] = value + + +inv_info['k8s_selector'] = { + 'inv_function': inv_k8s_selector, + 'includes': ['k8s.include'], +}

5 years, 6 months

Fix RRD data query integration tests for timezone independence

by Óscar Nájera

Module: check_mk Branch: master Commit: 00b2bf0039eac27ced1b1d69e2e3af2db9589b5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00b2bf0039eac2… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Mar 29 09:49:25 2019 +0100 Fix RRD data query integration tests for timezone independence CMK-1761 Change-Id: I95f8cf1055b80680554039a78fb2dbaec799efb3 --- .../cmk_base/test_services_prediction.py | 55 +++++++++++++++------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/tests/integration/cmk_base/test_services_prediction.py b/tests/integration/cmk_base/test_services_prediction.py index 9bad75c..70d511b 100644 --- a/tests/integration/cmk_base/test_services_prediction.py +++ b/tests/integration/cmk_base/test_services_prediction.py @@ -1,10 +1,12 @@ # pylint: disable=redefined-outer-name +from contextlib import contextmanager from datetime import datetime import os import time import pytest +import freezegun import cmk.utils.prediction from cmk.utils.exceptions import MKGeneralException @@ -50,25 +52,46 @@ custom_checks = [ site.delete_dir("var/check_mk/rrd") -(a)pytest.mark.parametrize('date, period, result', [ - pytest.param("2018-11-28 12", "minute", (60, 60), id='1 min resolution in hour query'), - pytest.param("2018-11-27 12", "minute", (300, 12), id='5 min resolution in hour query'), - pytest.param("2018-11-15 12", "minute", (1800, 2), id='30 min resolution in hour query'), +@contextmanager +def on_time(utctime, timezone): + """Set the time and timezone for the test""" + os.environ['TZ'] = timezone + time.tzset() + with freezegun.freeze_time(utctime): + yield + os.environ.pop('TZ') + time.tzset() + + +(a)pytest.mark.parametrize('utcdate, timezone, period, result', [ + pytest.param("2018-11-28 12", "UTC", "minute", (60, 60), id='1 min resolution in hour query'), + pytest.param("2018-11-27 12", "UTC", "minute", (300, 12), id='5 min resolution in hour query'), + pytest.param( + "2018-11-15 12:25", "UTC", "minute", (1800, 2), id='30 min resolution in hour query'), + pytest.param( + "2018-07-15 12", "UTC", "minute", (21600, 1), id='hour query when resolution is 6hrs'), + pytest.param("2018-11-28 12", "UTC", "wday", (240, 360), id='max 360 points of data response'), + pytest.param("2018-11-27 12", "UTC", "wday", (300, 288), id='5 min resolution in day query'), + pytest.param("2018-11-10 12", "UTC", "day", (1800, 48), id='30 min resolution in day query'), pytest.param( - "2018-07-15 12", - "minute", (21600, 0), - id='hour query when resolution is 6hrs', - marks=pytest.mark.xfail), - pytest.param("2018-11-28 12", "wday", (240, 360), id='max 360 points of data response'), - pytest.param("2018-11-27 12", "wday", (300, 288), id='5 min resolution in day query'), - pytest.param("2018-11-10 12", "day", (1800, 48), id='30 min resolution in day query'), - pytest.param("2018-06-10 12", "hour", (21600, 4), id='6hrs resolution in day query'), + "2018-06-10 12", "UTC", "hour", (21600, 4), id='6hrs resolution in day query, in UTC'), + pytest.param( + "2018-06-10 12", + "Europe/Berlin", + "hour", (21600, 5), + id='6hrs resolution in day query, in Berlin'), + pytest.param( + "2018-06-10 12", + "America/New_York", + "hour", (21600, 5), + id='6hrs resolution in day query, in New_York'), ]) -def test_get_rrd_data(cfg_setup, date, period, result): +def test_get_rrd_data(cfg_setup, utcdate, timezone, period, result): - timestamp = time.mktime(datetime.strptime(date, "%Y-%m-%d %H").timetuple()) - _, from_time, until_time, _ = prediction.get_prediction_timegroup( - timestamp, prediction.prediction_periods[period]) + with on_time(utcdate, timezone): + timestamp = time.time() + _, from_time, until_time, _ = prediction.get_prediction_timegroup( + timestamp, prediction.prediction_periods[period]) step, data = cmk.utils.prediction.get_rrd_data('test-prediction', 'CPU load', 'load15', 'MAX', from_time, until_time)

5 years, 6 months

Remove unused FILE_PATH global variable for .mk config files

by Lars Michelsen

Module: check_mk Branch: master Commit: 856b998f543450c2b239ff746f69b514ecd9e9b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=856b998f543450… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 28 16:10:30 2019 +0100 Remove unused FILE_PATH global variable for .mk config files Check_MK base config files could contain references to a global variable FILE_PATH. This is an unused variable for a long time now. It was replaced by FOLDER_PATH in the early days of WATO. The FILE_PATH variable has now been cleaned up. If your configuration files contain such a variable, you need to clean it up or replace it with FOLDER_PATH. Change-Id: I34f493ee5d8a3af1b762e10caa9b18cc9831b395 --- cmk/gui/watolib/rulesets.py | 1 - cmk_base/config.py | 3 --- 2 files changed, 4 deletions(-) diff --git a/cmk/gui/watolib/rulesets.py b/cmk/gui/watolib/rulesets.py index 264b05f..6d3967f 100644 --- a/cmk/gui/watolib/rulesets.py +++ b/cmk/gui/watolib/rulesets.py @@ -78,7 +78,6 @@ class RulesetCollection(object): "ALL_SERVICES": [""], "NEGATE": NEGATE, "FOLDER_PATH": folder.path(), - "FILE_PATH": folder.path() + "/hosts.mk", } # Prepare empty rulesets so that rules.mk has something to diff --git a/cmk_base/config.py b/cmk_base/config.py index ec99a5c..b2ed2b8 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -201,7 +201,6 @@ def _perform_post_config_loading_actions(): def _load_config(with_conf_d, exclude_parents_mk): helper_vars = { - "FILE_PATH": None, "FOLDER_PATH": None, } @@ -222,12 +221,10 @@ def _load_config(with_conf_d, exclude_parents_mk): if _f.startswith(cmk.utils.paths.check_mk_config_dir + "/"): _file_path = _f[len(cmk.utils.paths.check_mk_config_dir) + 1:] global_dict.update({ - "FILE_PATH": _file_path, "FOLDER_PATH": os.path.dirname(_file_path), }) else: global_dict.update({ - "FILE_PATH": None, "FOLDER_PATH": None, })

5 years, 6 months

discovery: Show ignored check plugin names in vverbose mode

by Simon Betz

Module: check_mk Branch: master Commit: 9366131603aa5b58639a4a65c47694270b639ba6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9366131603aa5b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 28 09:09:17 2019 +0100 discovery: Show ignored check plugin names in vverbose mode Change-Id: If6608046cf3bc4cb6da9664db5d595335e6c789c --- cmk_base/discovery.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index ae38c19..d3e5298 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -799,6 +799,7 @@ def _get_host_sections_for_discovery(sources, use_caches): def _execute_discovery(multi_host_sections, hostname, ipaddress, check_plugin_name, on_error): # Skip this check type if is ignored for that host if config.service_ignored(hostname, check_plugin_name, None): + console.vverbose(" Skip ignored check plugin name '%s'\n" % check_plugin_name) return [] try:

5 years, 6 months

Minor cleanup of inventory argument computation

by Lars Michelsen

Module: check_mk Branch: master Commit: f2c55446068ec2a7886c16324617787b7232a6eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2c55446068ec2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 28 07:53:13 2019 +0100 Minor cleanup of inventory argument computation CMK-1818 Change-Id: I9f69948f7eef2ae52637f523e0f7369e552dc81c --- cmk_base/inventory.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 0f558b3..3b02e5b 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -260,12 +260,13 @@ def _do_inv_for_realhost(sources, multi_host_sections, hostname, ipaddress, inve inv_function_args = inspect.getargspec(inv_function).args kwargs = {} - if 'inventory_tree' in inv_function_args: - inv_function_args.remove('inventory_tree') - kwargs["inventory_tree"] = inventory_tree - if 'status_data_tree' in inv_function_args: - inv_function_args.remove('status_data_tree') - kwargs["status_data_tree"] = status_data_tree + for dynamic_arg_name, dynamic_arg_value in [ + ("inventory_tree", inventory_tree), + ("status_data_tree", status_data_tree), + ]: + if dynamic_arg_name in inv_function_args: + inv_function_args.remove(dynamic_arg_name) + kwargs[dynamic_arg_name] = dynamic_arg_value if len(inv_function_args) == 2: params = _get_inv_params(hostname, section_name)

5 years, 6 months

mk_docker.py: report exceptions to server

by Moritz Kiemer

Module: check_mk Branch: master Commit: bd25414571342a5f9a204230851d6a1142d017df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd25414571342a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Mar 28 11:12:35 2019 +0100 mk_docker.py: report exceptions to server Change-Id: I56fba1a5a68a02107fde945eee9ba11a5047722b --- agents/plugins/mk_docker.py | 9 +++---- checks/docker_node_info | 14 +++++------ .../datasets/docker_node_info_unknown.py | 28 ++++++++++++++++++++++ tests/unit/plugins/test_mk_docker.py | 7 +++--- 4 files changed, 43 insertions(+), 15 deletions(-) diff --git a/agents/plugins/mk_docker.py b/agents/plugins/mk_docker.py index c8661ec..d533420 100755 --- a/agents/plugins/mk_docker.py +++ b/agents/plugins/mk_docker.py @@ -150,10 +150,11 @@ class Section(list): sys.stdout.write("%s\n" % line) -def report_exception_to_server(exc): +def report_exception_to_server(exc, location): LOGGER.info("handling exception: %s", exc) + msg = "Plugin exception in %s: %s" % (location, exc) sec = Section('node_info') - sec.append(json.dumps({"PluginException": str(exc)})) + sec.append(json.dumps({"Unknown": msg})) sec.write() @@ -464,7 +465,7 @@ def main(): try: # first calls by docker-daemon: report failure client = MKDockerClient(config) except () if DEBUG else Exception as exc: - report_exception_to_server(exc) + report_exception_to_server(exc, "MKDockerClient.__init__") sys.exit(1) set_version_info(client) @@ -473,7 +474,7 @@ def main(): try: section(client, config) except () if DEBUG else Exception as exc: - LOGGER.info("caught exception: %s", exc) + report_exception_to_server(exc, section.__name__) if __name__ == "__main__": diff --git a/checks/docker_node_info b/checks/docker_node_info index f560f9e..41766c9 100644 --- a/checks/docker_node_info +++ b/checks/docker_node_info @@ -63,25 +63,25 @@ def append_deprecation_warning(check_function): def parse_docker_node_info(info): version = docker_get_version(info) # pylint: disable=undefined-variable - if version is None: return parse_legacy_docker_node_info(info) # pylint: disable=undefined-variable if len(info) < 2: return {} - loaded = docker_json_get_obj(info[1]) # pylint: disable=undefined-variable - return loaded or {} + loaded = {} + for line in info[1:]: + loaded.update(docker_json_get_obj(line) or {}) # pylint: disable=undefined-variable + return loaded @append_deprecation_warning # pylint: disable=undefined-variable def check_docker_node_info(_no_item, _no_params, parsed): if "Name" in parsed: yield 0, 'Daemon running on host %s' % parsed["Name"] - if "Warning" in parsed: - yield 1, parsed["Warning"] - if "Critical" in parsed: - yield 2, parsed["Critical"] + for state, key in enumerate(("Warning", "Critical", "Unknown"), 1): + if key in parsed: + yield state, parsed[key] check_info['docker_node_info'] = { diff --git a/tests/unit/checks/generictests/datasets/docker_node_info_unknown.py b/tests/unit/checks/generictests/datasets/docker_node_info_unknown.py new file mode 100644 index 0000000..91380e2 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/docker_node_info_unknown.py @@ -0,0 +1,28 @@ +# yapf: disable + + +checkname = 'docker_node_info' + + +info = [ + ['@docker_version_info', '{"PluginVersion": "0.1", "DockerPyVersion": "3.7.0", "ApiVersion": "1.39"}'], + ['{"Name": "klappson"}'], + ['@docker_version_info', '{"PluginVersion": "0.1", "DockerPyVersion": "3.7.0", "ApiVersion": "1.39"}'], + ['{"Unknown": "Plugin exception in section_node_disk_usage: Kokosnuss geklaut"}'], +] + + +discovery = { + '': [(None, {})], + 'containers': [(None, {})], +} + + +checks = { + '': [ + (None, {}, [ + (0, u'Daemon running on host klappson', []), + (3, u'Plugin exception in section_node_disk_usage: Kokosnuss geklaut', []), + ]), + ], +} diff --git a/tests/unit/plugins/test_mk_docker.py b/tests/unit/plugins/test_mk_docker.py index fdb9cd6..e53371a 100644 --- a/tests/unit/plugins/test_mk_docker.py +++ b/tests/unit/plugins/test_mk_docker.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(cmk_path(), 'agents', 'plugins')) import mk_docker # pylint: disable=import-error,wrong-import-position PLUGIN_CHECKSUMS = { - '0.1': 'aec6ebec8565d1326d1b0df52191d594', + '0.1': 'f43bbe8ce8f19763d53ffa116988fa2d', } @@ -21,8 +21,7 @@ def test_docker_plugin_version(): assert md5 == PLUGIN_CHECKSUMS.get(mk_docker.VERSION), """ Plugin source code has changed. If your changes are compatible to previous versions, - add the new md5 sum of the plugin to the corresponding - list in PLUIGIN_CHECKSUMS. + put the new md5 sum of the plugin into PLUIGIN_CHECKSUMS. If your change is incompatible, increase the mk_docker.VERSION - and start a new list to PLUIGIN_CHECKSUMS. + and put a new entry into PLUIGIN_CHECKSUMS. """

5 years, 6 months

check_http: refactor common SNI option

by Moritz Kiemer

Module: check_mk Branch: master Commit: b7acbb68fc5a6018bab1490040806d5bc5a142e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7acbb68fc5a60… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Mar 27 14:18:13 2019 +0100 check_http: refactor common SNI option CMK-1873 Change-Id: I43ff11d6ab65941ca98f26bae9959e7bb2af93f8 --- checks/check_http | 18 ++++++++---------- cmk/gui/plugins/wato/active_checks.py | 25 ++++++++----------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/checks/check_http b/checks/check_http index 849abeb..bd63cb2 100644 --- a/checks/check_http +++ b/checks/check_http @@ -42,6 +42,9 @@ def _transform_check_http(params): if "proxy_auth" in mode: proxy["auth"] = mode["proxy_auth"] + if "sni" in mode: + transformed["sni"] = mode.pop("sni") + return transformed @@ -74,7 +77,7 @@ def _get_proxy(params): return ProxySettings(proxy.get("address"), proxy.get("port"), auth) -def _certificate_args(host, proxy, settings): +def _certificate_args(host, proxy, settings, sni_flag): args = [] server = settings.get('cert_host', host.address) @@ -90,9 +93,6 @@ def _certificate_args(host, proxy, settings): warn, crit = settings["cert_days"] args += ['-C', '%d,%d' % (warn, crit)] - if "sni" in settings: - args += ['--sni'] - server_port = settings.get("port") specify_port = proxy.port if proxy else server_port @@ -107,7 +107,7 @@ def _certificate_args(host, proxy, settings): if server_port: server += ':%s' % server_port - elif settings.get("sni"): + elif sni_flag: args += ['-H', server] args += [server] @@ -146,9 +146,6 @@ def _url_args(host, proxy, settings): elif ssl: args += ['--ssl=%s' % ssl] - if "sni" in settings: - args += ['--sni'] - if "response_time" in settings: args += [ '-w', @@ -230,9 +227,10 @@ def check_http_arguments(params): host = _get_host(settings) proxy = _get_proxy(params) + args = ['--sni'] if params.get("sni") else [] if mode_name == 'cert': - return _certificate_args(host, proxy, settings) - return _url_args(host, proxy, settings) + return args + _certificate_args(host, proxy, settings, params.get("sni")) + return args + _url_args(host, proxy, settings) def check_http_description(params): diff --git a/cmk/gui/plugins/wato/active_checks.py b/cmk/gui/plugins/wato/active_checks.py index 11407cd3..64f8512 100644 --- a/cmk/gui/plugins/wato/active_checks.py +++ b/cmk/gui/plugins/wato/active_checks.py @@ -1003,6 +1003,11 @@ class RulespecActiveChecksHttp(HostRulespec): "<tt>HTTP</tt> or <tt>HTTPS</tt>."), allow_empty=False)), ("proxy", self._proxyspec()), + ("sni", + FixedValue( + value=True, + totext="", + title=_("Enable SSL/TLS hostname extension support (SNI)"))), ("mode", CascadingDropdown( title=_("Mode of the Check"), @@ -1059,13 +1064,6 @@ class RulespecActiveChecksHttp(HostRulespec): ), forth=lambda x: x is True and "auto" or x, )), - ("sni", - FixedValue( - value=True, - totext=_("enable SNI"), - title=_( - "Enable SSL/TLS hostname extension support (SNI)"), - )), ("response_time", Tuple( title=_("Expected response time"), @@ -1282,16 +1280,6 @@ class RulespecActiveChecksHttp(HostRulespec): ), ("port", self._portspec(443)), _ip_address_family_element(), - ( - "sni", - FixedValue( - value=True, - totext=_("enable SNI"), - title=_( - "Enable SSL/TLS hostname extension support (SNI)" - ), - ), - ), ], required_keys=["cert_days"], )), @@ -1326,6 +1314,9 @@ class RulespecActiveChecksHttp(HostRulespec): if auth: proxy["auth"] = auth + if "sni" in mode: + transformed["sni"] = mode.pop("sni") + return transformed

5 years, 6 months

check_http: move help text

by Moritz Kiemer

Module: check_mk Branch: master Commit: 182356f7a28577acd0b13280ab67f09be344c502 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=182356f7a28577… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Mar 27 20:48:57 2019 +0100 check_http: move help text CMK-1873 Change-Id: Id7254f5168f69970e136f96d66414bd4ccbc589a --- cmk/gui/plugins/wato/active_checks.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk/gui/plugins/wato/active_checks.py b/cmk/gui/plugins/wato/active_checks.py index 64f8512..c72b3c1 100644 --- a/cmk/gui/plugins/wato/active_checks.py +++ b/cmk/gui/plugins/wato/active_checks.py @@ -1243,16 +1243,16 @@ class RulespecActiveChecksHttp(HostRulespec): ("cert", _("Check SSL Certificate Age"), Dictionary( title=_("Certificate Checking"), + help=_("Port defaults to 443. In this mode the URL" + " is not checked."), elements=[ ( "cert_days", Transform( Tuple( title=_("Age"), - help= - _("Minimum number of days a certificate has to be valid. " - "Port defaults to 443. When this option is used the URL " - "is not checked."), + help=_("Minimum number of days a certificate" + " has to be valid."), elements=[ Integer( title=_("Warning at or below"),

5 years, 6 months

check_http: stop testing invalid params

by Moritz Kiemer

Module: check_mk Branch: master Commit: f72040ead729d2ee3f0b0771dafd44951160ef35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f72040ead729d2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Mar 28 07:47:00 2019 +0100 check_http: stop testing invalid params We had "allow_empty=False" for this parameter. CMK-1873 Change-Id: Iee56ed6634daecb7834aca775afb49aa96b0d3b8 --- tests/unit/checks/test_check_http.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/unit/checks/test_check_http.py b/tests/unit/checks/test_check_http.py index 3bcffc7..1244117 100644 --- a/tests/unit/checks/test_check_http.py +++ b/tests/unit/checks/test_check_http.py @@ -69,29 +69,29 @@ pytestmark = pytest.mark.checks ), ( (None, { - 'virthost': (None, True), + 'virthost': ("virtual.host", True), 'proxy': "foo.bar", }), - ['-I', 'foo.bar'], + ['-I', 'foo.bar', '-H', 'virtual.host'], ), ( (None, { - 'virthost': (None, False), + 'virthost': ("virtual.host", False), 'proxy': "foo.bar", }), - ['-I', 'foo.bar'], + ['-I', 'foo.bar', '-H', 'virtual.host'], ), ( (None, { - 'virthost': (None, True), + 'virthost': ("virtual.host", True), }), - [], + ['-H', 'virtual.host'], ), ( (None, { - 'virthost': (None, False), + 'virthost': ("virtual.host", False), }), - ['-I', '$_HOSTADDRESS_4$'], + ['-I', '$_HOSTADDRESS_4$', '-H', 'virtual.host'], ), ]) def test_check_http_argument_parsing(check_manager, params, expected_args):

5 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019