Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

mk_docker.py: avoid some error messages in dockerd log

by Moritz Kiemer

Module: check_mk Branch: master Commit: e3b667029e2700cf3b5c8b5ee4ef88aa72efa612 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3b667029e2700… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 15 10:02:23 2019 +0100 mk_docker.py: avoid some error messages in dockerd log Previously we simply tried to execute the agent in the container, which resulted in errror messages if it was not found on the PATH. We now first open a shell, which hope fully will be present and thus avoid the dockerd error log. CMK-1662 Change-Id: I3487097104351fb3e548c0a7068c2d3e977d8b71 --- agents/plugins/mk_docker.py | 6 ++++-- tests/unit/plugins/test_mk_docker.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/agents/plugins/mk_docker.py b/agents/plugins/mk_docker.py index c8ccdc3..04a3fc2 100755 --- a/agents/plugins/mk_docker.py +++ b/agents/plugins/mk_docker.py @@ -227,7 +227,9 @@ class AgentDispatcher(object): '''run check_mk agent in container or container context''' LOGGER.debug("trying to run containers check_mk_agent") - result = container.exec_run('check_mk_agent', environment=self.env, socket=True) + result = container.exec_run(['sh', '-c', 'check_mk_agent'], + environment=self.env, + socket=True) output = self.get_stdout(result) if output: LOGGER.info("successfully ran containers check_mk_agent") @@ -238,7 +240,7 @@ class AgentDispatcher(object): if not self.agent_code: LOGGER.info("failed to load agent code: %s", self.agent_code_exc) return None - result = container.exec_run('bash', socket=True) + result = container.exec_run(['sh', '-c', 'bash -c echo'], socket=True) if not self.get_stdout(result): LOGGER.info("failed to run bash in container: %s", container.short_id) return None diff --git a/tests/unit/plugins/test_mk_docker.py b/tests/unit/plugins/test_mk_docker.py index b62d429..590ec85 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': '2e03d077fbefb3b10a51600aa23d2154', + '0.1': '609daeed48fda1198701458e9bd4f205', }

5 years, 7 months

mk_jolokia.py: prepare default params for argparse

by Moritz Kiemer

Module: check_mk Branch: master Commit: da00a039cb812f5bea297966529c78192321af1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da00a039cb812f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 15 09:03:19 2019 +0100 mk_jolokia.py: prepare default params for argparse We want to have shared code with the agent, so prepare to use these arguments in agents argparse logic. Change-Id: I1cbdb02bb4b55885f64e01f4736f2ab9099c9695 --- agents/plugins/mk_jolokia.py | 56 +++++++++++++++++++---------------- tests/unit/plugins/test_mk_jolokia.py | 11 ++++--- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 74ab972..a8dc71b 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -28,7 +28,6 @@ import os import socket import sys import urllib2 -import copy try: try: @@ -55,30 +54,6 @@ except ImportError as import_error: VERBOSE = '--verbose' in sys.argv DEBUG = '--debug' in sys.argv -DEFAULT_CONFIG = { - # Default global configuration values - "protocol": "http", - "server": "localhost", - "port": 8080, - "timeout": 1.0, - "user": "monitoring", - "password": None, - "mode": "digest", - "suburi": "jolokia", - "instance": None, - "verify": None, # if not set, we change it to True - "client_cert": None, - "client_key": None, - "service_url": None, - "service_user": None, - "service_password": None, - "product": None, - "custom_vars": [], - # List of instances to monitor. Each instance is a dict where - # the global configuration values can be overridden. - "instances": [{}], -} - QUERY_SPECS_GENERIC = [ ("java.lang:type=Memory", "NonHeapMemoryUsage/used", "NonHeapMemoryUsage", [], False), ("java.lang:type=Memory", "NonHeapMemoryUsage/max", "NonHeapMemoryMax", [], False), @@ -162,6 +137,31 @@ QUERY_SPECS_SPECIFIC = { False),], } +# Default global configuration: key, value [, help] +DEFAULT_CONFIG_TUPLES = ( + ("protocol", "http", "Protocol to use (http/https)."), + ("server", "localhost", "Host name or IP address of the Jolokia server."), + ("port", 8080, "TCP Port of the Jolokia server."), + ("suburi", "jolokia", "Path-component of the URI to query."), + ("user", "monitoring", "Username to use for connecting."), + ("password", None, "Password to use for connecting."), + ("mode", "digest", "Authentication mode. Can be \"basic\", \"digest\" or \"https\"."), + ("instance", None, "Name of the instance in the monitoring. Defaults to port."), + ("verify", None), + ("client_cert", None, "Path to client cert for https authentication."), + ("client_key", None, "Client cert secret for https authentication."), + ("service_url", None), + ("service_user", None), + ("service_password", None), + ("product", None, "Product description. Available: %s" % \ + ", ".join(QUERY_SPECS_SPECIFIC.keys())), + ("timeout", 1.0, "Connection/read timeout for requests."), + ("custom_vars", []), + # List of instances to monitor. Each instance is a dict where + # the global configuration values can be overridden. + ("instances", [{}]), +) + class SkipInstance(RuntimeError): pass @@ -171,6 +171,10 @@ class SkipMBean(RuntimeError): pass +def get_default_config_dict(): + return {t[0]: t[1] for t in DEFAULT_CONFIG_TUPLES} + + def write_section(name, iterable): sys.stdout.write('<<<%s:sep(0)>>>\n' % name) for line in iterable: @@ -497,7 +501,7 @@ def generate_values(inst, var_list): def yield_configured_instances(custom_config=None): if custom_config is None: - custom_config = copy.deepcopy(DEFAULT_CONFIG) + custom_config = get_default_config_dict() conffile = os.path.join(os.getenv("MK_CONFDIR", "/etc/check_mk"), "jolokia.cfg") if os.path.exists(conffile): diff --git a/tests/unit/plugins/test_mk_jolokia.py b/tests/unit/plugins/test_mk_jolokia.py index 3170f98..5b896fa 100644 --- a/tests/unit/plugins/test_mk_jolokia.py +++ b/tests/unit/plugins/test_mk_jolokia.py @@ -2,7 +2,6 @@ # pylint: disable=protected-access import os import sys -import copy import pytest from testlib import cmk_path # pylint: disable=import-error @@ -15,7 +14,7 @@ SANITIZE = mk_jolokia.JolokiaInstance._sanitize_config @pytest.mark.parametrize("removed", ["protocol", "server", "port", "suburi", "timeout"]) def test_missing_config_basic(removed): - config = copy.deepcopy(mk_jolokia.DEFAULT_CONFIG) + config = mk_jolokia.get_default_config_dict() config.pop(removed) with pytest.raises(ValueError): SANITIZE(config) @@ -26,7 +25,7 @@ def test_missing_config_auth(): msg_pattern = r'Missing key\(s\): %s in configuration for UnitTest' % key_string return pytest.raises(ValueError, match=msg_pattern) - config = copy.deepcopy(mk_jolokia.DEFAULT_CONFIG) + config = mk_jolokia.get_default_config_dict() for key in ("password", "user", "service_password", "client_cert", "client_key"): config.pop(key) config["instance"] = "UnitTest" @@ -53,20 +52,20 @@ def test_missing_config_auth(): def test_config_instance(): - config = copy.deepcopy(mk_jolokia.DEFAULT_CONFIG) + config = mk_jolokia.get_default_config_dict() assert SANITIZE(config).get("instance") == "8080" config["instance"] = "some spaces in string" assert SANITIZE(config).get("instance") == "some_spaces_in_string" def test_config_timeout(): - config = copy.deepcopy(mk_jolokia.DEFAULT_CONFIG) + config = mk_jolokia.get_default_config_dict() config["timeout"] = '23' assert isinstance(SANITIZE(config).get("timeout"), float) def test_config_legacy_cert_path_to_verify(): - config = copy.deepcopy(mk_jolokia.DEFAULT_CONFIG) + config = mk_jolokia.get_default_config_dict() config["verify"] = None assert SANITIZE(config).get("verify") is True config["cert_path"] = "_default"

5 years, 7 months

aws_exceptions: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: f8fdadebba758357573417a62863f97fcb8b39ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8fdadebba7583… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 15 15:19:16 2019 +0100 aws_exceptions: Minor cleanup Change-Id: I5cf5a6cf2a15fc81dbc2db200906176fde1d5f34 --- checks/aws_exceptions | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/checks/aws_exceptions b/checks/aws_exceptions index 80a4c8d..27612ab 100644 --- a/checks/aws_exceptions +++ b/checks/aws_exceptions @@ -24,23 +24,32 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +AWSNoExceptionsText = "No exceptions" -def inventory_aws_exceptions(info): - if info: + +def parse_aws_exceptions(info): + parsed = {} + for line in info: + parsed.setdefault(line[0], set()).add(" ".join(line[1:])) + return parsed + + +def inventory_aws_exceptions(parsed): + if parsed: return [(None, {})] -def check_aws_exceptions(item, params, info): - for line in info: - joined_line = " ".join(line) - if joined_line.endswith('No exceptions'): - state = 0 +def check_aws_exceptions(item, params, parsed): + for title, messages in parsed.iteritems(): + errors = [message for message in messages if message != AWSNoExceptionsText] + if errors: + yield 2, "%s %s" % (title, ", ".join(errors)) else: - state = 2 - yield state, joined_line + yield 0, '%s %s' % (title, AWSNoExceptionsText) check_info['aws_exceptions'] = { + 'parse_function': parse_aws_exceptions, 'inventory_function': inventory_aws_exceptions, 'check_function': check_aws_exceptions, 'service_description': 'AWS Exceptions',

5 years, 7 months

aws_rds_connections: Fixed wrong valuespec

by Simon Betz

Module: check_mk Branch: master Commit: 845331794fbbfb565672bc8ccdba14d70cec9120 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=845331794fbbfb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 15 15:06:49 2019 +0100 aws_rds_connections: Fixed wrong valuespec Change-Id: I3cf42b0973a3930b3c7816973673693476ccb58d --- cmk/gui/plugins/wato/check_parameters/aws.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters/aws.py b/cmk/gui/plugins/wato/check_parameters/aws.py index 502619f..47deb15 100644 --- a/cmk/gui/plugins/wato/check_parameters/aws.py +++ b/cmk/gui/plugins/wato/check_parameters/aws.py @@ -596,8 +596,8 @@ class RulespecCheckgroupParametersAwsRdsConnections(CheckParameterRulespecWithIt Tuple( title=_("Set levels"), elements=[ - Percentage(title=_("Warning at")), - Percentage(title=_("Critical at")), + Integer(title=_("Warning at")), + Integer(title=_("Critical at")), ]), Tuple( title=_("No levels"),

5 years, 7 months

aws_costs_and_usage: Added resource info

by Simon Betz

Module: check_mk Branch: master Commit: 25a5c1d940937bb0df9cf0a3335f18ea5c9f8fa6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25a5c1d940937b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 15 14:55:30 2019 +0100 aws_costs_and_usage: Added resource info Change-Id: I3c94032c59d63ec1018affef55d90963e1b71cb1 --- cmk/gui/plugins/wato/check_parameters/aws.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/wato/check_parameters/aws.py b/cmk/gui/plugins/wato/check_parameters/aws.py index 55dec4a..502619f 100644 --- a/cmk/gui/plugins/wato/check_parameters/aws.py +++ b/cmk/gui/plugins/wato/check_parameters/aws.py @@ -225,7 +225,7 @@ class RulespecCheckgroupParametersAwsCostsAndUsage(CheckParameterRulespecWithout @property def title(self): - return _("AWS Costs and Usage") + return _("AWS/CE Costs and Usage") @property def match_type(self):

5 years, 7 months

agent_aws: New checks for AWS/RDS

by Simon Betz

Module: check_mk Branch: master Commit: fe2e338db5e7e5ee45d6b0125283c09bbd60a668 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe2e338db5e7e5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 11 14:23:03 2019 +0100 agent_aws: New checks for AWS/RDS Change-Id: I14c8f002bb5bc5dd94419afb1c40a1eeff5ee6ee --- agents/special/agent_aws | 158 ++++++++- checkman/aws_rds | 15 + checkman/aws_rds.agent_jobs | 14 + checkman/aws_rds.bin_log_usage | 14 + checkman/aws_rds.connections | 14 + checkman/aws_rds.cpu_credits | 16 + checkman/aws_rds.disk_io | 14 + checkman/aws_rds.network_io | 14 + checkman/aws_rds.replica_lag | 16 + checkman/aws_rds.replication_slot_usage | 15 + checkman/aws_rds.transaction_logs_usage | 15 + checkman/aws_rds_summary | 13 + checkman/aws_rds_summary.db_status | 14 + checks/aws.include | 16 +- checks/aws_ebs | 15 +- checks/aws_rds | 473 +++++++++++++++++++++++++++ checks/aws_rds_summary | 88 +++++ cmk/gui/plugins/metrics/check_mk.py | 31 ++ cmk/gui/plugins/wato/check_parameters/aws.py | 332 ++++++++++++++++--- cmk/gui/plugins/wato/datasource_programs.py | 1 + tests/unit/cmk/gui/watolib/test_rulespecs.py | 32 ++ 21 files changed, 1252 insertions(+), 68 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fe2e338db5…

5 years, 7 months

Site connection status text messages are now shown in status columns

by Lars Michelsen

Module: check_mk Branch: master Commit: 104adff2f3d7e06fbc2d3843115a6091704c8b01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=104adff2f3d7e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 14:41:29 2019 +0100 Site connection status text messages are now shown in status columns Instead of showing them in the tooltips of the icons, the status messages are now directly shown in the table. CMK-1663 Change-Id: I42e3d1484dc8a7b9b71fd1d6f72f6a4db8b34fa9 --- cmk/gui/wato/pages/sites.py | 71 +++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/cmk/gui/wato/pages/sites.py b/cmk/gui/wato/pages/sites.py index 73f174b..afe4b04 100644 --- a/cmk/gui/wato/pages/sites.py +++ b/cmk/gui/wato/pages/sites.py @@ -689,6 +689,10 @@ class ModeDistributedMonitoring(WatoMode): def _show_status_connection_status(self, table, site_id, site): table.text_cell("") + encrypted_url = watolib.folder_preserving_link([("mode", "site_livestatus_encryption"), + ("site", site_id)]) + html.icon_button(encrypted_url, _("Show details about livestatus encryption"), "encrypted") + # The status is fetched asynchronously for all sites. Show a temporary loading icon. html.open_div(id_="livestatus_status_%s" % site_id, class_="connection_status") html.icon( @@ -697,26 +701,32 @@ class ModeDistributedMonitoring(WatoMode): class_=["reloading", "replication_status_loading"]) html.close_div() - encrypted_url = watolib.folder_preserving_link([("mode", "site_livestatus_encryption"), - ("site", site_id)]) - html.icon_button(encrypted_url, _("Show details about livestatus encryption"), "encrypted") - def _show_config_connection_config(self, table, site_id, site): table.text_cell(_("Configuration connection")) if not site["replication"]: - html.icon(_("Configuration connection not enabled for this site"), "disabled") + html.write_text(_("Not enabled")) return - html.icon(_("Replication enabled for this site"), "enabled") - + html.write_text(_("Enabled")) + parts = [] if site.get("replicate_ec"): - html.icon(_("Replicate Event Console configuration to this site"), "mkeventd") + parts.append("EC") if site.get("replicate_mkps"): - html.icon(_("Replicate extensions"), "mkps") + parts.append("MKPs") + if parts: + html.write_text(" (%s)" % ", ".join(parts)) def _show_config_connection_status(self, table, site_id, site): table.text_cell("") + if site["replication"]: + if site.get("secret"): + logout_url = watolib.make_action_link([("mode", "sites"), ("_logout", site_id)]) + html.icon_button(logout_url, _("Logout"), "autherr") + else: + login_url = watolib.make_action_link([("mode", "sites"), ("_login", site_id)]) + html.icon_button(login_url, _("Login"), "authok") + html.open_div(id_="replication_status_%s" % site_id, class_="connection_status") if site.get("replication"): # The status is fetched asynchronously for all sites. Show a temporary loading icon. @@ -726,16 +736,6 @@ class ModeDistributedMonitoring(WatoMode): class_=["reloading", "replication_status_loading"]) html.close_div() - if not site["replication"]: - return - - if site.get("secret"): - logout_url = watolib.make_action_link([("mode", "sites"), ("_logout", site_id)]) - html.icon_button(logout_url, _("Logout"), "autherr") - else: - login_url = watolib.make_action_link([("mode", "sites"), ("_login", site_id)]) - html.icon_button(login_url, _("Login"), "authok") - class ModeAjaxFetchSiteStatus(WatoWebApiMode): """AJAX handler for asynchronous fetching of the site status""" @@ -751,12 +751,13 @@ class ModeAjaxFetchSiteStatus(WatoWebApiMode): for site_id, site in sites: site_states[site_id] = { - "livestatus": self._render_livestatus_status(site_id, site), - "replication": self._render_replication_status(site_id, site, replication_status), + "livestatus": self._render_status_connection_status(site_id, site), + "replication": self._render_configuration_connection_status( + site_id, site, replication_status), } return site_states - def _render_replication_status(self, site_id, site, replication_status): + def _render_configuration_connection_status(self, site_id, site, replication_status): """Check whether or not the replication connection is possible. This deals with these situations: @@ -770,12 +771,17 @@ class ModeAjaxFetchSiteStatus(WatoWebApiMode): status = replication_status[site_id] if status.success: - msg = _("Site is reachable (Version: %s, Edition: %s)") % (status.response.version, - status.response.edition) - return html.render_icon("success", title=msg) - return html.render_icon("failed", title="%s" % status.response) + icon = "success" + msg = _("Online (Version: %s, Edition: %s)") % (status.response.version, + status.response.edition) + else: + icon = "failed" + msg = "%s" % status.response - def _render_livestatus_status(self, site_id, site): + return (html.render_icon(icon, title=msg) + html.render_span( + msg, style="vertical-align:middle")) + + def _render_status_connection_status(self, site_id, site): site_status = cmk.gui.sites.state(site_id, {}) if site.get("disabled", False) is True: status = status_msg = "disabled" @@ -785,14 +791,11 @@ class ModeAjaxFetchSiteStatus(WatoWebApiMode): if "exception" in site_status: message = "%s" % site_status["exception"] else: - message = _("This site is %s") % status_msg - - if message.startswith("[SSL:"): - status_msg = "TLS error" + message = status_msg.title() - with html.plugged(): - html.status_label(content=status_msg, status=status, title=message) - return html.drain() + icon = "success" if status == "online" else "failed" + return (html.render_icon(icon, title=message) + html.render_span( + message, style="vertical-align:middle")) cmk.gui.pages.register_page_handler(

5 years, 7 months

Improved Distributed Monitoring list usability

by Lars Michelsen

Module: check_mk Branch: master Commit: 8f4ef0b29710753cfc3c85cf2f1cabc4e460dd64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f4ef0b2971075… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 14:32:59 2019 +0100 Improved Distributed Monitoring list usability * Introduce new naming: "Status connection" is now used for the livestatus connection and "Configuration connection" is now used for the WATO configuration replication. * Put status connection settings, status and actions next to each other in the sites table * Put configuration connection settings, status and actions next to each other in the sites table CMK-1663 Change-Id: I46d6db95115ba88da4bffeb225694e5a13f3b12f --- cmk/gui/wato/pages/sites.py | 77 ++++++++++++++++--------------- web/htdocs/themes/classic/scss/_wato.scss | 4 ++ 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/cmk/gui/wato/pages/sites.py b/cmk/gui/wato/pages/sites.py index 5679f66..73f174b 100644 --- a/cmk/gui/wato/pages/sites.py +++ b/cmk/gui/wato/pages/sites.py @@ -90,7 +90,7 @@ def _site_detail_buttons(site_id, site, current_mode): if current_mode != "site_livestatus_encryption": encrypted_url = watolib.folder_preserving_link([("mode", "site_livestatus_encryption"), ("site", site_id)]) - html.context_button(_("Livestatus TLS"), encrypted_url, "encrypted") + html.context_button(_("Status encryption"), encrypted_url, "encrypted") def _site_globals_editable(site_id, site): @@ -240,8 +240,8 @@ class ModeEditSite(WatoMode): elements=basic_elements + livestatus_elements + replication_elements, headers=[ (_("Basic settings"), [key for key, _vs in basic_elements]), - (_("Livestatus settings"), [key for key, _vs in livestatus_elements]), - (_("Configuration Replication"), [key for key, _vs in replication_elements]), + (_("Status connection"), [key for key, _vs in livestatus_elements]), + (_("Configuration connection"), [key for key, _vs in replication_elements]), ], render="form", form_narrow=True, @@ -644,10 +644,10 @@ class ModeDistributedMonitoring(WatoMode): self._show_buttons(table, site_id, site) self._show_basic_settings(table, site_id, site) - self._show_livestatus_settings(table, site_id, site) - self._show_replication_configuration(table, site_id, site) - self._show_livestatus_status(table, site_id, site) - self._show_replication_status(table, site_id, site) + self._show_status_connection_config(table, site_id, site) + self._show_status_connection_status(table, site_id, site) + self._show_config_connection_config(table, site_id, site) + self._show_config_connection_status(table, site_id, site) html.javascript("cmk.sites.fetch_site_status();") @@ -663,10 +663,6 @@ class ModeDistributedMonitoring(WatoMode): delete_url = html.makeactionuri([("_delete", site_id)]) html.icon_button(delete_url, _("Delete"), "delete") - encrypted_url = watolib.folder_preserving_link([("mode", "site_livestatus_encryption"), - ("site", site_id)]) - html.icon_button(encrypted_url, _("Show details about livestatus encryption"), "encrypted") - if _site_globals_editable(site_id, site): globals_url = watolib.folder_preserving_link([("mode", "edit_site_globals"), ("site", site_id)]) @@ -681,27 +677,34 @@ class ModeDistributedMonitoring(WatoMode): html.icon_button(globals_url, title, icon) - if site["replication"]: - if site.get("secret"): - logout_url = watolib.make_action_link([("mode", "sites"), ("_logout", site_id)]) - html.icon_button(logout_url, _("Logout"), "autherr") - else: - login_url = watolib.make_action_link([("mode", "sites"), ("_login", site_id)]) - html.icon_button(login_url, _("Login"), "authok") - def _show_basic_settings(self, table, site_id, site): table.text_cell(_("ID"), site_id) table.text_cell(_("Alias"), site.get("alias", "")) - def _show_livestatus_settings(self, table, site_id, site): - table.cell(_("Connection")) + def _show_status_connection_config(self, table, site_id, site): + table.cell(_("Status connection")) vs_connection = self._site_mgmt.connection_method_valuespec() html.write(vs_connection.value_to_text(site["socket"])) - def _show_replication_configuration(self, table, site_id, site): - table.text_cell(_("Replication")) + def _show_status_connection_status(self, table, site_id, site): + table.text_cell("") + + # The status is fetched asynchronously for all sites. Show a temporary loading icon. + html.open_div(id_="livestatus_status_%s" % site_id, class_="connection_status") + html.icon( + _("Fetching livestatus status"), + "reload", + class_=["reloading", "replication_status_loading"]) + html.close_div() + + encrypted_url = watolib.folder_preserving_link([("mode", "site_livestatus_encryption"), + ("site", site_id)]) + html.icon_button(encrypted_url, _("Show details about livestatus encryption"), "encrypted") + + def _show_config_connection_config(self, table, site_id, site): + table.text_cell(_("Configuration connection")) if not site["replication"]: - html.icon(_("Replication not enabled for this site"), "disabled") + html.icon(_("Configuration connection not enabled for this site"), "disabled") return html.icon(_("Replication enabled for this site"), "enabled") @@ -711,20 +714,10 @@ class ModeDistributedMonitoring(WatoMode): if site.get("replicate_mkps"): html.icon(_("Replicate extensions"), "mkps") - def _show_livestatus_status(self, table, site_id, site): - table.text_cell(_("Livestatus")) + def _show_config_connection_status(self, table, site_id, site): + table.text_cell("") - # The status is fetched asynchronously for all sites. Show a temporary loading icon. - html.open_div(id_="livestatus_status_%s" % site_id) - html.icon( - _("Fetching livestatus status"), - "reload", - class_=["reloading", "replication_status_loading"]) - html.close_div() - - def _show_replication_status(self, table, site_id, site): - table.text_cell(_("Repl. status")) - html.open_div(id_="replication_status_%s" % site_id) + html.open_div(id_="replication_status_%s" % site_id, class_="connection_status") if site.get("replication"): # The status is fetched asynchronously for all sites. Show a temporary loading icon. html.icon( @@ -733,6 +726,16 @@ class ModeDistributedMonitoring(WatoMode): class_=["reloading", "replication_status_loading"]) html.close_div() + if not site["replication"]: + return + + if site.get("secret"): + logout_url = watolib.make_action_link([("mode", "sites"), ("_logout", site_id)]) + html.icon_button(logout_url, _("Logout"), "autherr") + else: + login_url = watolib.make_action_link([("mode", "sites"), ("_login", site_id)]) + html.icon_button(login_url, _("Login"), "authok") + class ModeAjaxFetchSiteStatus(WatoWebApiMode): """AJAX handler for asynchronous fetching of the site status""" diff --git a/web/htdocs/themes/classic/scss/_wato.scss b/web/htdocs/themes/classic/scss/_wato.scss index 1f5d31a..c72d7f7 100644 --- a/web/htdocs/themes/classic/scss/_wato.scss +++ b/web/htdocs/themes/classic/scss/_wato.scss @@ -147,6 +147,10 @@ Boston, MA 02110-1301 USA. font-weight: bold; } +.wato div.connection_status { + display: inline-block; +} + .wato table.auditlog td.nobreak { white-space: nowrap; }

5 years, 7 months

mk_docker.py: clean up inventory

by Moritz Kiemer

Module: check_mk Branch: master Commit: 908d2df4db5351d1668372858c84b2e043fa4a96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=908d2df4db5351… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 14 12:01:11 2019 +0100 mk_docker.py: clean up inventory Also fix some bugs in docker_node_network on the way. CMK-1662 Change-Id: Ic8a06223984624d97021f7d9c9a0c77830edf9b7 --- cmk/gui/plugins/views/inventory.py | 11 +++++++++-- inventory/docker_node_images | 4 ++-- inventory/docker_node_network | 36 ++++++++++++++++++------------------ 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 33d55c8..2d27714 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -535,6 +535,11 @@ def inv_paint_docker_labels(labels): return "labels", html.render_br().join(sorted(labels.split(", "))) +@decorate_inv_paint +def inv_paint_lines_csv(lines): + return "", lines.replace(",", "<br>") + + #. # .--display hints-------------------------------------------------------. # | _ _ _ _ _ _ | @@ -1033,17 +1038,19 @@ inventory_displayhints.update({ ".software.applications.docker.num_images": {"title": _("# Images")}, ".software.applications.docker.images:": { "title": _("Images"), - "keyorder": ["id", "repository", "tag", "creation", "size", "labels", "amount_containers"], + "keyorder": ["id", "creation", "size", "labels", "amount_containers", "repotags", "repodigests"], "view": "invdockerimages_of_host", }, ".software.applications.docker.images:*.id": {"title": _("ID")}, ".software.applications.docker.images:*.labels": {"paint": "docker_labels"}, ".software.applications.docker.images:*.amount_containers": {"title": _("# Containers")}, + ".software.applications.docker.images:*.repotags": {"title": _("Repository/Tag"), "paint": "lines_csv"}, + ".software.applications.docker.images:*.repodigests": {"title": _("Digests"), "paint": "lines_csv"}, # Node containers ".software.applications.docker.containers:": { "title": _("Containers"), - "keyorder": ["id", "repository", "tag", "creation", "name", "creation", "labels", "status"], + "keyorder": ["id", "creation", "name", "labels", "status", "image"], "view": "invdockercontainers_of_host", }, ".software.applications.docker.containers:*.id": {"title": _("ID")}, diff --git a/inventory/docker_node_images b/inventory/docker_node_images index addcf62..20c40f4 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -69,8 +69,8 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): for image_id, image in sorted(images.iteritems()): inv_node.append({ - "repotags": image.get("RepoTags", []), - "repodigests": image.get("RepoDigests", []), + "repotags": ", ".join(image.get("RepoTags", [])), + "repodigests": ", ".join(image.get("RepoDigests", [])), "id": docker_get_short_id(image_id), # pylint: disable=undefined-variable "creation": image["Created"], "size": image["VirtualSize"], diff --git a/inventory/docker_node_network b/inventory/docker_node_network index a585fb8..de08fe5 100644 --- a/inventory/docker_node_network +++ b/inventory/docker_node_network @@ -26,13 +26,14 @@ def parse_docker_network(info): - version = docker_get_version(info) # pylint: disable=undefined-variable + # pylint: disable=undefined-variable + version = docker_get_version(info) if version is None: - networks = parse_legacy_docker_network_inspect(info) # pylint: disable=undefined-variable + networks = parse_legacy_docker_network_inspect(info) return DeprecatedDict((n["Id"], n) for n in networks) - networks = (docker_json_get_obj(line) for line in info[1:]) # pylint: disable=undefined-variable + networks = (docker_json_get_obj(line) for line in info[1:]) return {n["Id"]: n for n in networks if n is not None} @@ -41,43 +42,42 @@ def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): for network_id, network in parsed.iteritems(): - containers = [] - for container_id, container in network["Containers"].iteritems(): - containers.append({ + sorted_container_items = sorted(network["Containers"].items()) + + containers = [ + { "name": container["Name"], "id": docker_get_short_id(container_id), # pylint: disable=undefined-variable "ipv4_address": container["IPv4Address"], "ipv6_address": container["IPv6Address"], "mac_address": container["MacAddress"], - }) + } for container_id, container in sorted_container_items + ] network_name = network["Name"] path = "software.applications.docker.networks.%s." % network_name - inventory_networks = inventory_tree.get_dict(path) - status_networks = status_data_tree.get_dict(path) + inventory_network = inventory_tree.get_dict(path) + status_network = status_data_tree.get_dict(path) - status_networks.update({ + status_network.update({ "name": network_name, - "containers": [{ - "name": 1 - }], + "containers": containers, }) - network_ = { + inventory_network.update({ "name": network_name, "network_id": docker_get_short_id(network_id), # pylint: disable=undefined-variable "scope": network["Scope"], - } + }) try: - network_["host_ifname"] = network["Options"]["com.docker.network.bridge.name"] + inventory_network["host_ifname"] = network["Options"]["com.docker.network.bridge.name"] except KeyError: pass labels = docker_format_labels(network) # pylint: disable=undefined-variable if labels: - network_["labels"] = labels - inventory_networks.update(network_) + inventory_network["labels"] = labels inv_info["docker_node_network.networks"] = { # pylint: disable=undefined-variable

5 years, 7 months

aws_s3, aws_s3.summary: Upper levels for the (total) bucket size are configurable now

by Simon Betz

Module: check_mk Branch: master Commit: 010a3b486919e9f254e637515a23e7c13f4d19be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=010a3b486919e9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 15 11:43:15 2019 +0100 aws_s3, aws_s3.summary: Upper levels for the (total) bucket size are configurable now Change-Id: I7b5e220ea3859225dca73dc674fabd867283dc3d --- checkman/aws_s3 | 3 ++ checkman/aws_s3.summary | 3 ++ checks/aws_s3 | 21 +++++--- cmk/gui/plugins/wato/check_parameters/aws.py | 72 ++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 6 deletions(-) diff --git a/checkman/aws_s3 b/checkman/aws_s3 index d470566..9fae280 100644 --- a/checkman/aws_s3 +++ b/checkman/aws_s3 @@ -10,5 +10,8 @@ description: To make this check work you have to configure the related special agent {Amazon Web Services (AWS)}. + There are no default levels set for the bucket size. Upper + levels are configurable. + inventory: One service per bucket will be created. diff --git a/checkman/aws_s3.summary b/checkman/aws_s3.summary index b7aa661..556fa89 100644 --- a/checkman/aws_s3.summary +++ b/checkman/aws_s3.summary @@ -9,5 +9,8 @@ description: To make this check work you have to configure the related special agent {Amazon Web Services (AWS)}. + There are no default levels set for the total bucket size. Upper + levels are configurable. + inventory: One summary service is created. diff --git a/checks/aws_s3 b/checks/aws_s3 index fc032a1..0c25461 100644 --- a/checks/aws_s3 +++ b/checks/aws_s3 @@ -70,12 +70,14 @@ def check_aws_s3_objects(item, params, metrics): storage_infos.append( "%s: %s" % (aws_s3_storage_mapping[storage_type], get_bytes_human_readable(value))) sum_size = sum(bucket_sizes.values()) + yield check_levels( + sum_size, + "aws_bucket_size", + params.get('bucket_size_levels', (None, None)), + human_readable_func=get_bytes_human_readable, + infoname='Bucket size') if storage_infos: - storage_infos_str = " (%s)" % ", ".join(storage_infos) - else: - storage_infos_str = "" - yield (0, 'Bucket size: %s%s' % (get_bytes_human_readable(sum_size), storage_infos_str), - [('aws_bucket_size', sum_size)]) + yield 0, ", ".join(storage_infos) num_objects = sum(metrics['numberofobjects'].values()) yield 0, 'Number of objects: %s' % int(num_objects), [('aws_num_objects', num_objects)] @@ -98,6 +100,7 @@ check_info['aws_s3'] = { 'service_description': 'AWS/S3 Objects %s', 'has_perfdata': True, 'includes': ['aws.include'], + 'group': 'aws_s3_buckets_objects', } #. @@ -121,7 +124,12 @@ def check_aws_s3_summary(item, params, parsed): if bucket_size >= largest_bucket_size: largest_bucket = bucket_name largest_bucket_size = bucket_size - yield 0, 'Total size: %s' % get_bytes_human_readable(sum_size), [('aws_bucket_size', sum_size)] + yield check_levels( + sum_size, + "aws_bucket_size", + params.get('bucket_size_levels', (None, None)), + human_readable_func=get_bytes_human_readable, + infoname='Total size') if largest_bucket: yield 0, 'Largest bucket: %s (%s)' % \ @@ -133,4 +141,5 @@ check_info['aws_s3.summary'] = { 'check_function': check_aws_s3_summary, 'service_description': 'AWS/S3 Summary', 'has_perfdata': True, + 'group': 'aws_s3_buckets', } diff --git a/cmk/gui/plugins/wato/check_parameters/aws.py b/cmk/gui/plugins/wato/check_parameters/aws.py index 0a96bc2..7048690 100644 --- a/cmk/gui/plugins/wato/check_parameters/aws.py +++ b/cmk/gui/plugins/wato/check_parameters/aws.py @@ -35,6 +35,7 @@ from cmk.gui.valuespec import ( Age, FixedValue, TextAscii, + Filesize, ) from cmk.gui.plugins.wato import ( RulespecGroupCheckParametersApplications, @@ -44,6 +45,77 @@ from cmk.gui.plugins.wato import ( ) +def _vs_s3_buckets(): + return ('bucket_size_levels', + Alternative( + title=_("Upper levels for the bucket size"), + style="dropdown", + elements=[ + Tuple( + title=_("Set levels"), + elements=[ + Filesize(title=_("Warning at")), + Filesize(title=_("Critical at")), + ]), + Tuple( + title=_("No levels"), + elements=[ + FixedValue(None, totext=""), + FixedValue(None, totext=""), + ]), + ])) + + +(a)rulespec_registry.register +class RulespecCheckgroupParametersAwsS3BucketsObjects(CheckParameterRulespecWithItem): + @property + def group(self): + return RulespecGroupCheckParametersApplications + + @property + def check_group_name(self): + return "aws_s3_buckets_objects" + + @property + def title(self): + return _("AWS/S3 Bucket Objects") + + @property + def match_type(self): + return "dict" + + @property + def parameter_valuespec(self): + return Dictionary(elements=[_vs_s3_buckets()]) + + @property + def item_spec(self): + return TextAscii(title=_("The bucket name")) + + +(a)rulespec_registry.register +class RulespecCheckgroupParametersAwsS3Buckets(CheckParameterRulespecWithoutItem): + @property + def group(self): + return RulespecGroupCheckParametersApplications + + @property + def check_group_name(self): + return "aws_s3_buckets" + + @property + def title(self): + return _("AWS/S3 Buckets") + + @property + def match_type(self): + return "dict" + + @property + def parameter_valuespec(self): + return Dictionary(elements=[_vs_s3_buckets()]) + + def _vs_burst_balance(): return ('burst_balance_levels_lower', Alternative(

5 years, 7 months

← Newer
1
...
20
21
22
23
24
25
26
...
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