Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

mk_jolokia.exe: Adapt Makefile for frozen binary

by Konstantin Büttner

Module: check_mk Branch: master Commit: a69fab347bc16e75b96bf3fb04c4926c338023e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a69fab347bc16e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 6 11:45:46 2019 +0100 mk_jolokia.exe: Adapt Makefile for frozen binary Change-Id: If893c75b730f2b672b27fd5c649a03d3b0c9eb2b --- agents/windows/frozen_binaries/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/frozen_binaries/Makefile b/agents/windows/frozen_binaries/Makefile index 17b9362..05a7155 100644 --- a/agents/windows/frozen_binaries/Makefile +++ b/agents/windows/frozen_binaries/Makefile @@ -37,7 +37,7 @@ mk_logwatch.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredis cp $(BUILD_DIR)/drive_c/compile/dist/mk_logwatch.exe ../plugins rm -rf $(BUILD_DIR) -mk_jolokia.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredist_x86.exe $(PLUGINS_DIR)/mk_jolokia +mk_jolokia.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredist_x87.exe $(PLUGINS_DIR)/mk_jolokia.py mkdir $(BUILD_DIR) ; \ cd $(BUILD_DIR) ; \ cp -pr $(CURDIR)/src/* . ; \ @@ -54,7 +54,7 @@ mk_jolokia.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredist cd drive_c/pip ; \ wine c:\\Python27\\python.exe -m pip install --no-index --find-links="c:\\pip" * ; \ mkdir $(BUILD_DIR)/drive_c/compile ; \ - cp $(PLUGINS_DIR)/mk_jolokia $(BUILD_DIR)/drive_c/compile/mk_jolokia.py ; \ + cp $(PLUGINS_DIR)/mk_jolokia.py $(BUILD_DIR)/drive_c/compile/mk_jolokia.py ; \ cd $(BUILD_DIR)/drive_c/compile ; \ wine c:\\Python27\\Scripts\\pyinstaller.exe \ --clean \

5 years, 4 months

7017 Livestatus via TCP can now be encrypted

by Lars Michelsen

Module: check_mk Branch: master Commit: 1169611baeb2db7378d9ee238fe7d61433395fd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1169611baeb2db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 27 21:18:08 2018 +0100 7017 Livestatus via TCP can now be encrypted Livestatus has been a plain text protocol since it's invention. This is normally OK for system local connections via unix socket or TCP connections in secure networks. Users always had the choice to secure the communication using TLS (e.g. via stunnel), SSH, VPN or some other solution that encrypts the communication in their local setup. To improve the security for all users of Check_MK, we have now changed the Livestatus TCP communication to be encrypted by default using TLS. This is realized using an internal CA and internally generated certificates. Existing sites that already have Livestatus via TCP enabled before updating to 1.6 still use the unencrypted communication for compatibility. An analyze configuration" test will create a CRITICAL message about the unencrypted Livestatus TCP configuration in this situation. Technical details: <ul> <li>For new sites Livestatus via TCP is encrypted by default. Existing sites which already have Livestatus via TCP enabled during the update keep the communication unencrypted for compatibility reasons. This is managed using the new 'omd config' option LIVESTATUS_TCP_TLS. This setting can also be managed through the "Global Settings > Site Management".</li> <li>During update or site creation a site local CA certificate is created to manage the sites local certificates.</li> <li>The site local certificate is created automatically during update or site creation.</li> <li>The sites local CA and certificates are stored in 'etc/ssl'. The CA certificate is always located at 'etc/ssl/ca.pem'.</li> <li>The keys are 2048 bit RSA keys and the certificates are signed using SHA512.</li> <li>The CA certificate is valid for 10 years, the site certificates are valid for 3 years.</li> <li>Check_MK / OMD code may use 'omdlib.certs.SiteLocalCA(site_id)' to use the local CA</li> <li>stunnel is introduced as site internal daemon that serves the TLS wrapped socket once it has been enabled through 'omd config'. </ul> CMK-1535 Change-Id: I3f33668c9b000c8d4a4186a853dc163c567a8ee3 --- .werks/7017 | 51 +++++++ cmk/gui/plugins/wato/ac_tests.py | 32 ++++ cmk/gui/watolib/config_domains.py | 3 + cmk/gui/watolib/sites.py | 14 +- omd/Makefile | 1 + omd/packages/mk-livestatus/LIVESTATUS_TCP_TLS | 29 ++++ omd/packages/mk-livestatus/mk-livestatus.make | 1 + omd/packages/omd/omdlib/certs.py | 161 +++++++++++++++++++++ omd/packages/omd/omdlib/main.py | 29 ++++ omd/packages/packages.make | 1 + omd/packages/stunnel/skel.permissions | 1 + omd/packages/stunnel/skel/etc/init.d/stunnel | 84 +++++++++++ omd/packages/stunnel/skel/etc/logrotate.d/stunnel | 7 + omd/packages/stunnel/skel/etc/rc.d/85-stunnel | 1 + omd/packages/stunnel/skel/etc/stunnel/server.conf | 12 ++ omd/packages/stunnel/stunnel.make | 12 ++ tests/integration/omd/test_hooks.py | 1 + tests/integration/omd/test_init_scripts.py | 1 + .../cmk/gui/watolib/test_analyze_configuration.py | 1 + tests/unit/omdlib/test_certs.py | 78 ++++++++++ tests/unit/omdlib/test_omdlib_main.py | 12 ++ 21 files changed, 531 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1169611bae…

5 years, 4 months

Fixed broken performance graph dashlet in CRE after GUI refactorings

by Lars Michelsen

Module: check_mk Branch: master Commit: cd46f3ee6fb2708bb5dc83f9253afc76d9dd4d47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd46f3ee6fb270… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 10:30:36 2019 +0100 Fixed broken performance graph dashlet in CRE after GUI refactorings Change-Id: I8b3070b8725b47131477b5517c89f3426eb212cc --- cmk/gui/plugins/dashboard/graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/dashboard/graph.py b/cmk/gui/plugins/dashboard/graph.py index b2c8cca..564f254 100644 --- a/cmk/gui/plugins/dashboard/graph.py +++ b/cmk/gui/plugins/dashboard/graph.py @@ -112,8 +112,8 @@ class GraphDashlet(Dashlet): ] import cmk.gui.metrics as metrics - import cmk.gui.cee.plugins.metrics.graphs as graphs if metrics.cmk_graphs_possible(): + import cmk.gui.cee.plugins.metrics.graphs as graphs elements += [ ("graph_render_options", graphs.vs_graph_render_options(

5 years, 4 months

Various fixes for CME after GUI refactorings

by Lars Michelsen

Module: check_mk Branch: master Commit: 408c7cfd09d28155945c24e734bb4322ec354448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=408c7cfd09d281… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 23:04:49 2019 +0100 Various fixes for CME after GUI refactorings Change-Id: I3208269f5632bf50da16f7e81cfd9d3253f3203f --- cmk/gui/watolib/groups.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/watolib/groups.py b/cmk/gui/watolib/groups.py index b3454d2..2015265 100644 --- a/cmk/gui/watolib/groups.py +++ b/cmk/gui/watolib/groups.py @@ -190,7 +190,7 @@ def save_group_information(all_groups, custom_default_config_dir=None): multisite_groups[what][gid][attr] = value # Save Check_MK world related parts - store.mkdir(check_mk_config_dir) + store.makedirs(check_mk_config_dir) output = wato_fileheader() for what in ["host", "service", "contact"]: if check_mk_groups.get(what): @@ -200,7 +200,7 @@ def save_group_information(all_groups, custom_default_config_dir=None): cmk.utils.store.save_file("%s/groups.mk" % check_mk_config_dir, output) # Users with passwords for Multisite - store.mkdir(multisite_config_dir) + store.makedirs(multisite_config_dir) output = wato_fileheader() for what in ["host", "service", "contact"]: if multisite_groups.get(what):

5 years, 4 months

Addition to 7017: Made liveproxy TLS aware

by Lars Michelsen

Module: check_mk Branch: master Commit: bbc9edaa700488d34882b4e4432e65bb0a9b5adf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbc9edaa700488… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 22:44:49 2019 +0100 Addition to 7017: Made liveproxy TLS aware CMK-1535 Change-Id: I61758cb60feeec419457b0af755afbf9f0b67731 --- cmk/gui/watolib/sites.py | 20 +++++++------ livestatus/api/python/livestatus.py | 58 ++++++++++++++++++++----------------- 2 files changed, 43 insertions(+), 35 deletions(-) diff --git a/cmk/gui/watolib/sites.py b/cmk/gui/watolib/sites.py index 664f19f..340d5f7 100644 --- a/cmk/gui/watolib/sites.py +++ b/cmk/gui/watolib/sites.py @@ -530,17 +530,19 @@ class CEESiteManagement(SiteManagement): conf = {} for siteid, siteconf in sites.items(): - family_spec, address_spec = siteconf["socket"] - if family_spec == "proxy": - conf[siteid] = { - "socket": address_spec["socket"], - } + socket_type, params = siteconf["socket"] + if socket_type != "proxy": + continue - if "tcp" in address_spec: - conf[siteid]["tcp"] = address_spec["tcp"] + conf[siteid] = { + "socket": params["socket"], + } + + if "tcp" in params: + conf[siteid]["tcp"] = params["tcp"] - if address_spec["params"]: - conf[siteid].update(address_spec["params"]) + if params["params"]: + conf[siteid].update(params["params"]) store.save_to_mk_file(path, "sites", conf) diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index 871fec5..1448388 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -100,6 +100,36 @@ def lqencode(s): return s.replace('\n', '') +def site_local_ca_path(): + """Path to the site local CA bundle""" + omd_root = os.getenv("OMD_ROOT") + if not omd_root: + raise MKLivestatusConfigError("OMD_ROOT is not set. You are not running in OMD context.") + + return os.path.join(omd_root, "etc/ssl/ca.pem") + + +def create_client_socket(family, tls, verify, ca_file_path): + """Create a client socket object for the livestatus connection""" + sock = socket.socket(family, socket.SOCK_STREAM) + + if not tls: + return sock + + context = ssl.create_default_context() + context.check_hostname = False + context.verify_mode = ssl.CERT_REQUIRED if verify else ssl.CERT_NONE + context.options |= ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1 + + ca_file_path = ca_file_path if ca_file_path is not None else site_local_ca_path() + try: + context.load_verify_locations(ca_file_path) + except Exception as e: + raise MKLivestatusConfigError("Failed to load CA file '%s': %s" % (ca_file_path, e)) + + return context.wrap_socket(sock) + + #. # .--Helpers-------------------------------------------------------------. # | _ _ _ | @@ -277,17 +307,9 @@ class SingleSiteConnection(Helpers): # type: () -> str """CA file bundle to use for certificate verification""" if self._tls_ca_file_path is None: - return self._site_local_ca_path() + return site_local_ca_path() return self._tls_ca_file_path - def _site_local_ca_path(self): - omd_root = os.getenv("OMD_ROOT") - if not omd_root: - raise MKLivestatusConfigError( - "OMD_ROOT is not set. You are not running in OMD context.") - - return os.path.join(omd_root, "etc/ssl/ca.pem") - def successfully_persisted(self): # type: () -> bool return self.successful_persistence @@ -374,23 +396,7 @@ class SingleSiteConnection(Helpers): It ensures that either a TLS secured socket or a plain text socket is being created.""" - sock = socket.socket(family, socket.SOCK_STREAM) - - if not self.tls: - return sock - - context = ssl.create_default_context() - context.check_hostname = False - context.verify_mode = ssl.CERT_REQUIRED if self.tls_verify else ssl.CERT_NONE - context.options |= ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1 - - try: - context.load_verify_locations(cafile=self.tls_ca_file_path) - except Exception as e: - raise MKLivestatusConfigError( - "Failed to load CA file '%s': %s" % (self.tls_ca_file_path, e)) - - return context.wrap_socket(sock) + return create_client_socket(family, self.tls, self.tls_verify, self._tls_ca_file_path) def disconnect(self): self.socket = None

5 years, 4 months

Addition to 7017: stunnel, livestatus client, WATO sites

by Lars Michelsen

Module: check_mk Branch: master Commit: ed58199074d82f224d66a4db91a9b77daf2420f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed58199074d82f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Dec 29 13:15:20 2018 +0100 Addition to 7017: stunnel, livestatus client, WATO sites * Build stunnel and ship it with Check_MK * livestatus.py now able to handle encryption * SingleSiteConnection can now be configured to establish a connection with a TLS encrypted livestatus server. * It still connects in plain text mode by default. * You can use the new constructor arguments for configuring TLS: * tls=True|False: Enable or disable TLS * ca_file_path=None|path-to-pem: Path to a CA bundle file that contains the CA certficates to trust. In case this is set to None, which is the default, the site local CA certificate will be used. * verify=True/False: Accept any certificate or just certificates that are issued by CAs that trusted (see option above). * Distributed configuration in WATO can now configure encrypted connections to sites. CMK-1535 Change-Id: I55c935d835718a42209fa76459108cc389127174 --- cmk/gui/config.py | 1 + cmk/gui/sites.py | 3 + cmk/gui/wato/pages/sites.py | 9 ++- cmk/gui/watolib/sites.py | 39 ++++++++++++ livestatus/api/python/livestatus.py | 87 +++++++++++++++++++++++--- omd/packages/stunnel/stunnel-5.50.tar.gz | Bin 0 -> 973685 bytes omd/packages/stunnel/stunnel.make | 28 +++++++-- tests/integration/omd/test_basic_commands.py | 1 + tests/unit/cmk/gui/test_gui_config.py | 18 ++++-- tests/unit/cmk/gui/test_sites.py | 19 ++++++ tests/unit/livestatus/test_livestatus_unit.py | 56 ++++++++++++++++- 11 files changed, 239 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ed58199074…

5 years, 4 months

livestatus_status: Check for site SSL certificate validity

by Lars Michelsen

Module: check_mk Branch: master Commit: f9af84396a271e46d1020f8101bfbb09f705beb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9af84396a271e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jan 6 00:48:38 2019 +0100 livestatus_status: Check for site SSL certificate validity The check now warns about expiring SSL certificates. The thresholds default to a WARNING once 30 days are left and CRITICAL when only 7 days are left. CMK-1535 Change-Id: I8959dbe98d60dbbc097618c3a22d9fed76a7408c --- agents/check_mk_agent.linux | 14 ++++++++ checks/livestatus_status | 42 ++++++++++++++++++++-- .../wato/check_parameters/livestatus_status.py | 21 +++++++++++ 3 files changed, 74 insertions(+), 3 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index f0fc7f4..adc18e5 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -937,6 +937,20 @@ then waitmax 3 "/omd/sites/$site/bin/unixcat" "/omd/sites/$site/tmp/run/live" fi done + + echo '<<<livestatus_ssl_certs:sep(124)>>>' + for site in * + do + echo "[$site]" + for PEM_PATH in "/omd/sites/$site/etc/ssl/ca.pem" "/omd/sites/$site/etc/ssl/sites/$site.pem"; do + if [ -f "$PEM_PATH" ]; then + CERT_DATE=$(openssl x509 -enddate -noout -in "$PEM_PATH") + CERT_DATE=${CERT_DATE/notAfter=/} + echo "$PEM_PATH|$(date --date="$CERT_DATE" --utc +%s)" + fi + done + done + echo '<<<mkeventd_status:sep(0)>>>' for site in * do diff --git a/checks/livestatus_status b/checks/livestatus_status index 70d552e..d05c5ff 100644 --- a/checks/livestatus_status +++ b/checks/livestatus_status @@ -44,6 +44,7 @@ factory_settings["livestatus_status_default_levels"] = { "enable_notifications": 2, "process_performance_data": 1, "check_external_commands": 2, + "site_cert_days": (30, 7), } @@ -65,11 +66,31 @@ def parse_livestatus_status(info): return parsed -def inventory_livestatus_status(parsed): - return [(site, {}) for (site, status) in parsed.items() if status is not None] +def parse_livestatus_ssl_certs(info): + if not info: + return {} + parsed = {} + site = None + for line in info: + if line and line[0][0] == "[" and line[0][-1] == "]": + site = line[0][1:-1] + parsed[site] = {} + + elif site and len(line) == 2: + pem_path, valid_until = line + parsed[site][pem_path] = valid_until + + return parsed + + +def inventory_livestatus_status(sections): + return [(site, {}) for (site, status) in sections[0].items() if status is not None] + + +def check_livestatus_status(item, params, sections): + parsed, ssl_certs = sections[0], parse_livestatus_ssl_certs(sections[1]) -def check_livestatus_status(item, params, parsed): if item not in parsed: return status = parsed[item] @@ -121,6 +142,20 @@ def check_livestatus_status(item, params, parsed): yield 0, "Core version: %s" % status["program_version"] yield 0, "Livestatus version: %s" % status["livestatus_version"] + pem_path = "/omd/sites/%s/etc/ssl/sites/%s.pem" % (item, item) + cert_valid_until = ssl_certs.get(item, {}).get(pem_path) + if cert_valid_until is not None: + days_left = (int(cert_valid_until) - time.time()) / 86400.0 + valid_until_formatted = time.strftime("%Y-%m-%d %H:%M:%S", + time.localtime(int(cert_valid_until))) + yield check_levels( + value=days_left, + dsname="site_cert_days", + infoname="Site certificate validity (until %s)" % valid_until_formatted, + unit="days", + params=(None, None, params["site_cert_days"][0], params["site_cert_days"][1]), + ) + settings = [ ("execute_host_checks", "Active host checks are disabled"), ("execute_service_checks", "Active service checks are disabled"), @@ -162,4 +197,5 @@ check_info['livestatus_status'] = { "has_perfdata": True, "group": "livestatus_status", "default_levels_variable": "livestatus_status_default_levels", + "extra_sections": ["livestatus_ssl_certs"], } diff --git a/cmk/gui/plugins/wato/check_parameters/livestatus_status.py b/cmk/gui/plugins/wato/check_parameters/livestatus_status.py index 0f12203..4c4ab08 100644 --- a/cmk/gui/plugins/wato/check_parameters/livestatus_status.py +++ b/cmk/gui/plugins/wato/check_parameters/livestatus_status.py @@ -29,6 +29,8 @@ from cmk.gui.valuespec import ( Dictionary, MonitoringState, TextAscii, + Tuple, + Integer, ) from cmk.gui.plugins.wato import ( RulespecGroupCheckParametersApplications, @@ -70,6 +72,25 @@ register_check_parameters( MonitoringState(title="State when performance data is disabled", default_value=1)), ("check_external_commands", MonitoringState(title="State when not checking external commands", default_value=2)), + ("site_cert_days", + Tuple( + title=_("Site certificate validity"), + help=_("Minimum number of days a certificate has to be valid."), + elements=[ + Integer( + title=_("Warning at or below"), + minvalue=0, + unit=_("days"), + default_value=30, + ), + Integer( + title=_("Critical at or below"), + minvalue=0, + unit=_("days"), + default_value=7, + ), + ], + )) ]), TextAscii(title=_("Name of the monitoring site"),), match_type="dict",

5 years, 4 months

mk_jolokia.py: make exception msg deterministic

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2a49d04e09758d14b7eb751eb5d264d257d31b69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a49d04e09758d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Feb 6 09:11:21 2019 +0100 mk_jolokia.py: make exception msg deterministic Change-Id: I1a688a9f745ec04eb79f39b70f3e99295c79802c --- agents/plugins/mk_jolokia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index fb8e86e..0153da1 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -208,7 +208,7 @@ class JolokiaInstance(object): required_keys.add("service_password") missing_keys = required_keys - set(config.keys()) if missing_keys: - raise ValueError(err_msg % ("Missing key(s): %s" % ", ".join(missing_keys))) + raise ValueError(err_msg % ("Missing key(s): %s" % ", ".join(sorted(missing_keys)))) if not instance: instance = str(config["port"])

5 years, 4 months

mk_docker.py: prepare by renaming docker.include

by Moritz Kiemer

Module: check_mk Branch: master Commit: cc8f5dfb380296611a2a2cf5f6c86b7dde1a79fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc8f5dfb380296… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Feb 5 12:24:30 2019 +0100 mk_docker.py: prepare by renaming docker.include Change-Id: I1c679ed1dd24c5443d4ae7692606c29690cb4cf7 --- checks/docker_node_disk_usage | 2 +- checks/docker_node_info | 2 +- checks/{docker.include => legacy_docker.include} | 0 inventory/docker_node_images | 4 ++-- inventory/docker_node_network | 2 +- tests/unit/checks/test_docker_parse_helpers.py | 2 +- tests/unit/checks/test_docker_parse_network_inspect.py | 2 +- tests/unit/checks/test_docker_parse_node_images.py | 2 +- tests/unit/checks/test_docker_parse_node_info.py | 2 +- tests/unit/checks/test_docker_parse_subsection_image_inspect.py | 2 +- tests/unit/checks/test_docker_parse_system_df.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/checks/docker_node_disk_usage b/checks/docker_node_disk_usage index 716d2b8..6378ba5 100644 --- a/checks/docker_node_disk_usage +++ b/checks/docker_node_disk_usage @@ -62,7 +62,7 @@ check_info["docker_node_disk_usage"] = { "inventory_function": inventory_docker_node_disk_usage, "check_function": check_docker_node_disk_usage, "service_description": "Docker disk usage - %s", - "includes": ["docker.include"], + "includes": ["legacy_docker.include"], "has_perfdata": True, "group": "docker_node_disk_usage", } diff --git a/checks/docker_node_info b/checks/docker_node_info index 38c76c9..0a51008 100644 --- a/checks/docker_node_info +++ b/checks/docker_node_info @@ -39,7 +39,7 @@ def check_docker_node_info(item, params, parsed): check_info['docker_node_info'] = { - 'includes': ['docker.include'], + 'includes': ['legacy_docker.include'], 'parse_function': parse_docker_node_info, 'inventory_function': inventory_docker_node_info, 'check_function': check_docker_node_info, diff --git a/checks/docker.include b/checks/legacy_docker.include similarity index 100% rename from checks/docker.include rename to checks/legacy_docker.include diff --git a/inventory/docker_node_images b/inventory/docker_node_images index 80dab49..0825a7f 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -50,7 +50,7 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): inv_info['docker_node_images'] = { - 'includes': ['docker.include'], + 'includes': ['legacy_docker.include'], 'inv_function': inv_docker_node_images, 'has_status_data': True, } @@ -83,7 +83,7 @@ def _format_labels(labels): # using the extra_sections feature. In case this is not possible for the inventory # plugins at the moment we should make it possible. inv_info['docker_node_images.containers'] = { - 'includes': ['docker.include'], + 'includes': ['legacy_docker.include'], 'inv_function': inv_docker_node_images_containers, 'has_status_data': True, } diff --git a/inventory/docker_node_network b/inventory/docker_node_network index fb6f972..7953e49 100644 --- a/inventory/docker_node_network +++ b/inventory/docker_node_network @@ -69,6 +69,6 @@ def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): inv_info["docker_node_network.networks"] = { - "includes": ["docker.include"], + "includes": ["legacy_docker.include"], "inv_function": inv_docker_node_network_networks, } diff --git a/tests/unit/checks/test_docker_parse_helpers.py b/tests/unit/checks/test_docker_parse_helpers.py index 41d8d5b..8195a4a 100644 --- a/tests/unit/checks/test_docker_parse_helpers.py +++ b/tests/unit/checks/test_docker_parse_helpers.py @@ -3,7 +3,7 @@ import os pytestmark = pytest.mark.checks -execfile(os.path.join(os.path.dirname(__file__), '../../../checks/docker.include')) +execfile(os.path.join(os.path.dirname(__file__), '../../../checks/legacy_docker.include')) @pytest.mark.parametrize('indata,outdata', [ diff --git a/tests/unit/checks/test_docker_parse_network_inspect.py b/tests/unit/checks/test_docker_parse_network_inspect.py index a0ab810..6aec088 100644 --- a/tests/unit/checks/test_docker_parse_network_inspect.py +++ b/tests/unit/checks/test_docker_parse_network_inspect.py @@ -4,7 +4,7 @@ import re pytestmark = pytest.mark.checks -execfile(os.path.join(os.path.dirname(__file__), '../../../checks/docker.include')) +execfile(os.path.join(os.path.dirname(__file__), '../../../checks/legacy_docker.include')) regex = re.compile diff --git a/tests/unit/checks/test_docker_parse_node_images.py b/tests/unit/checks/test_docker_parse_node_images.py index e40420c..a3d12d2 100644 --- a/tests/unit/checks/test_docker_parse_node_images.py +++ b/tests/unit/checks/test_docker_parse_node_images.py @@ -7,7 +7,7 @@ pytestmark = pytest.mark.checks regex = re.compile -execfile(os.path.join(os.path.dirname(__file__), '../../../checks/docker.include')) +execfile(os.path.join(os.path.dirname(__file__), '../../../checks/legacy_docker.include')) REQUIRED_IMAGE_KEYS = ( diff --git a/tests/unit/checks/test_docker_parse_node_info.py b/tests/unit/checks/test_docker_parse_node_info.py index 391ea7d..f7e6db0 100644 --- a/tests/unit/checks/test_docker_parse_node_info.py +++ b/tests/unit/checks/test_docker_parse_node_info.py @@ -3,7 +3,7 @@ import os pytestmark = pytest.mark.checks -execfile(os.path.join(os.path.dirname(__file__), '../../../checks/docker.include')) +execfile(os.path.join(os.path.dirname(__file__), '../../../checks/legacy_docker.include')) @pytest.mark.parametrize('indata,outdata_subset', [ diff --git a/tests/unit/checks/test_docker_parse_subsection_image_inspect.py b/tests/unit/checks/test_docker_parse_subsection_image_inspect.py index 0e508b4..c360288 100644 --- a/tests/unit/checks/test_docker_parse_subsection_image_inspect.py +++ b/tests/unit/checks/test_docker_parse_subsection_image_inspect.py @@ -4,7 +4,7 @@ import re pytestmark = pytest.mark.checks -execfile(os.path.join(os.path.dirname(__file__), '../../../checks/docker.include')) +execfile(os.path.join(os.path.dirname(__file__), '../../../checks/legacy_docker.include')) regex = re.compile diff --git a/tests/unit/checks/test_docker_parse_system_df.py b/tests/unit/checks/test_docker_parse_system_df.py index a9dd43f..816ce10 100644 --- a/tests/unit/checks/test_docker_parse_system_df.py +++ b/tests/unit/checks/test_docker_parse_system_df.py @@ -4,7 +4,7 @@ import re pytestmark = pytest.mark.checks -execfile(os.path.join(os.path.dirname(__file__), '../../../checks/docker.include')) +execfile(os.path.join(os.path.dirname(__file__), '../../../checks/legacy_docker.include')) regex = re.compile

5 years, 4 months

Fixed typo in downtime mask

by Marcel Arentz

Module: check_mk Branch: master Commit: ee0d846da7cff8932be2d256fa8d8c8d821e9199 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee0d846da7cff8… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Feb 5 10:18:01 2019 +0100 Fixed typo in downtime mask Change-Id: Ide1393a465ee1fb3cf731b160d5d22b64de26239 --- cmk/gui/plugins/views/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/views/commands.py b/cmk/gui/plugins/views/commands.py index 4a1d223..9b69c73 100644 --- a/cmk/gui/plugins/views/commands.py +++ b/cmk/gui/plugins/views/commands.py @@ -994,7 +994,7 @@ class CommandScheduleDowntimes(Command): if self._has_recurring_downtimes(): html.hr() html.checkbox( - "_down_do_recur", False, label=_("Repeat this downtime on a regular base every")) + "_down_do_recur", False, label=_("Repeat this downtime on a regular basis every")) html.write_text(" ") from cmk.gui.cee.plugins.wato.cmc import recurring_downtimes_types

5 years, 4 months

← Newer
1
...
39
40
41
42
43
44
45
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019