Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: a9381a00c7bd1182c1d61e3ca26788e3e857e69e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9381a00c7bd11… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 15:11:03 2019 +0200 Rename tags_of_host to tag_list_of_host Change-Id: Idafc1f17de0d08426be24455ac7f5a5272c70a55 --- cmk_base/check_api.py | 2 +- cmk_base/config.py | 30 +++++++++++++++--------------- cmk_base/core_config.py | 2 +- cmk_base/data_sources/__init__.py | 2 +- cmk_base/modes/check_mk.py | 2 +- tests/unit/cmk_base/test_config.py | 10 +++++----- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 075f8dc..8c5811e 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -223,7 +223,7 @@ get_rule_options = _config.get_rule_options # the future check API. It's kept here for compatibility reasons for now. in_extraconf_hostlist = _config.in_extraconf_hostlist hosttags_match_taglist = _config.hosttags_match_taglist -tags_of_host = _config.tags_of_host +tags_of_host = _config.tag_list_of_host all_matching_hosts = _config.all_matching_hosts nagios_illegal_chars = _config.nagios_illegal_chars diff --git a/cmk_base/config.py b/cmk_base/config.py index ac155ee..9411c37 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -603,8 +603,8 @@ def strip_tags(tagged_hostlist): return result -def tags_of_host(hostname): - return get_config_cache().tags_of_host(hostname) +def tag_list_of_host(hostname): + return get_config_cache().tag_list_of_host(hostname) #. @@ -776,7 +776,7 @@ def all_configured_offline_hosts(): def host_is_member_of_site(hostname, site): - for tag in tags_of_host(hostname): + for tag in tag_list_of_host(hostname): if tag.startswith("site:"): return site == tag[5:] # hosts without a site: tag belong to all sites @@ -846,7 +846,7 @@ def is_agent_host(hostname): if is_tcp_host(hostname): return True - tags = tags_of_host(hostname) + tags = tag_list_of_host(hostname) if "piggyback" in tags: is_piggyback_host = True @@ -865,11 +865,11 @@ def is_dual_host(hostname): def is_all_agents_host(hostname): - return "all-agents" in tags_of_host(hostname) + return "all-agents" in tag_list_of_host(hostname) def is_all_special_agents_host(hostname): - return "special-agents" in tags_of_host(hostname) + return "special-agents" in tag_list_of_host(hostname) # @@ -893,19 +893,19 @@ def _primary_ip_address_family_of(hostname): def is_ipv4v6_host(hostname): - tags = tags_of_host(hostname) + tags = tag_list_of_host(hostname) return "ip-v6" in tags and "ip-v4" in tags def is_ipv6_host(hostname): - return "ip-v6" in tags_of_host(hostname) + return "ip-v6" in tag_list_of_host(hostname) def is_ipv4_host(hostname): """Whether or not the given host is configured to be monitored via IPv4. This is the case when it is set to be explicit IPv4 or implicit (when host is not an IPv6 host and not a "No IP" host)""" - tags = tags_of_host(hostname) + tags = tag_list_of_host(hostname) if "ip-v4" in tags: return True @@ -915,7 +915,7 @@ def is_ipv4_host(hostname): def is_no_ip_host(hostname): """Whether or not the given host is configured not to be monitored via IP""" - return "no-ip" in tags_of_host(hostname) + return "no-ip" in tag_list_of_host(hostname) # @@ -1456,7 +1456,7 @@ def service_depends_on(hostname, servicedesc): raise MKGeneralException("Invalid entry '%r' in service dependencies: " "must have 3 or 4 entries" % entry) - if hosttags_match_taglist(config_cache.tags_of_host(hostname), tags) and \ + if hosttags_match_taglist(config_cache.tag_list_of_host(hostname), tags) and \ in_extraconf_hostlist(hostlist, hostname): for pattern in patternlist: matchobject = regex(pattern).search(servicedesc) @@ -2784,7 +2784,7 @@ class HostConfig(object): self.is_cluster = is_cluster(hostname) self.part_of_clusters = self._config_cache.clusters_of(hostname) - tags = self._config_cache.tags_of_host(self.hostname) + tags = self._config_cache.tag_list_of_host(self.hostname) self.tags = tags self.tag_groups = host_tags.get(hostname, {}) @@ -2931,8 +2931,8 @@ class ConfigCache(object): parts = tagged_host.split("|") self._hosttags[parts[0]] = set(parts[1:]) - # TODO: Rename to tag_list_of_hosts, check all call sites and remove this - def tags_of_host(self, hostname): + # TODO: check all call sites and remove this + def tag_list_of_host(self, hostname): """Returns the list of all configured tags of a host. In case a host has no tags configured or is not known, it returns an empty list.""" @@ -3387,7 +3387,7 @@ class ConfigCache(object): cache[cache_id] = result else: for entry in conf: - actual_host_tags = self.tags_of_host(hostname) + actual_host_tags = self.tag_list_of_host(hostname) entry, rule_options = get_rule_options(entry) if rule_options.get("disabled"): continue diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 93f404c..c71f30d 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -391,7 +391,7 @@ def get_host_attributes(hostname, config_cache): # Pre 1.6 legacy attribute. We have changed our whole code to use the # livestatus column "tags" which is populated by all attributes starting with # "__TAG_" instead. We may deprecate this is one day. - attrs["_TAGS"] = " ".join(sorted(config_cache.tags_of_host(hostname))) + attrs["_TAGS"] = " ".join(sorted(config_cache.tag_list_of_host(hostname))) attrs.update(_get_tag_attributes(config_cache.tag_groups_of_host(hostname))) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 36e9e88..b991f2e 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -137,7 +137,7 @@ class DataSources(object): source.set_main_agent_data_source() self._add_source(source) - if "no-piggyback" not in config.tags_of_host(self._hostname): + if "no-piggyback" not in config.tag_list_of_host(self._hostname): self._add_source(PiggyBackDataSource(self._hostname, self._ipaddress)) def _initialize_snmp_data_sources(self): diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 096ebf2..6bfcf57 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -293,7 +293,7 @@ def _list_all_hosts_with_tags(tags): config_cache = config.get_config_cache() for h in hostlist: - if config.hosttags_match_taglist(config_cache.tags_of_host(h), tags): + if config.hosttags_match_taglist(config_cache.tag_list_of_host(h), tags): hosts.append(h) return hosts diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index d64c440..526fb82 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -21,7 +21,7 @@ def clear_config_caches(monkeypatch): ("testhost", ["no-ip"], False), ]) def test_is_ipv4_host(monkeypatch, hostname, tags, result): - monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) + monkeypatch.setattr(config, "tag_list_of_host", lambda h: {hostname: tags}[h]) assert config.is_ipv4_host(hostname) == result @@ -33,7 +33,7 @@ def test_is_ipv4_host(monkeypatch, hostname, tags, result): ("testhost", ["no-ip"], True), ]) def test_is_no_ip_host(monkeypatch, hostname, tags, result): - monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) + monkeypatch.setattr(config, "tag_list_of_host", lambda h: {hostname: tags}[h]) assert config.is_no_ip_host(hostname) == result @@ -58,7 +58,7 @@ def test_is_no_ip_host(monkeypatch, hostname, tags, result): def test_is_ipv6_primary_host(monkeypatch, hostname, tags, result, ruleset): monkeypatch.setattr(config, "all_hosts", ["%s|%s" % (hostname, "|".join(tags))]) monkeypatch.setattr(config, "host_paths", {hostname: "/"}) - monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) + monkeypatch.setattr(config, "tag_list_of_host", lambda h: {hostname: tags}[h]) monkeypatch.setattr(config, "primary_address_family", ruleset) config.get_config_cache().initialize() @@ -121,7 +121,7 @@ def test_is_snmp_host(monkeypatch, hostname, tags, result): ("testhost", ["cmk-agent"], False), ]) def test_is_all_agents_host(monkeypatch, hostname, tags, result): - monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) + monkeypatch.setattr(config, "tag_list_of_host", lambda h: {hostname: tags}[h]) assert config.is_all_agents_host(hostname) == result @@ -133,7 +133,7 @@ def test_is_all_agents_host(monkeypatch, hostname, tags, result): ("testhost", ["cmk-agent"], False), ]) def test_is_all_special_agents_host(monkeypatch, hostname, tags, result): - monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) + monkeypatch.setattr(config, "tag_list_of_host", lambda h: {hostname: tags}[h]) assert config.is_all_special_agents_host(hostname) == result

5 years, 3 months

Handle service tags in status GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 010de725b14d3623ebd754aee721e234e573e192 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=010de725b14d36… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 11:51:19 2019 +0200 Handle service tags in status GUI * Add painter, sorter and filter for the new service tags * Abstracted host tag GUI elements to be able to deal with host and service tables CMK-1815 Change-Id: I17cdc52f1f67d8bdc05cb730259b4dc9c521fd11 --- cmk/gui/plugins/views/painters.py | 103 ++++++++++++++++++++++++++++++------- cmk/gui/plugins/views/sorters.py | 42 +++++++++++++-- cmk/gui/plugins/views/utils.py | 2 + cmk/gui/plugins/visuals/filters.py | 79 +++++++++++++++++++++------- cmk/gui/view_utils.py | 20 ++++++- cmk/gui/wato/pages/folders.py | 3 +- web/htdocs/js/modules/utils.js | 17 +++--- 7 files changed, 213 insertions(+), 53 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=010de725b1…

5 years, 3 months

Rename tag_groups_of_host to tags_of_host

by Lars Michelsen

Module: check_mk Branch: master Commit: c542bc2b0df122e844958a89e26e8c2b54cffce2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c542bc2b0df122… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 15:12:12 2019 +0200 Rename tag_groups_of_host to tags_of_host Change-Id: I03138d92f8ed901a03aada35351976a0c9b06819 --- cmk_base/config.py | 3 +-- cmk_base/core_config.py | 2 +- cmk_base/dump_host.py | 5 +++-- tests/unit/cmk_base/test_config.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 9411c37..af569be 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2938,8 +2938,7 @@ class ConfigCache(object): empty list.""" return self._hosttags.get(hostname, []) - # TODO: Rename to tags_of_host - def tag_groups_of_host(self, hostname): + def tags_of_host(self, hostname): """Returns the dict of all configured tag groups and values of a host""" return host_tags.get(hostname, {}) diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index c71f30d..294be85 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -393,7 +393,7 @@ def get_host_attributes(hostname, config_cache): # "__TAG_" instead. We may deprecate this is one day. attrs["_TAGS"] = " ".join(sorted(config_cache.tag_list_of_host(hostname))) - attrs.update(_get_tag_attributes(config_cache.tag_groups_of_host(hostname))) + attrs.update(_get_tag_attributes(config_cache.tags_of_host(hostname))) if "alias" not in attrs: attrs["alias"] = config.alias_of(hostname, hostname) diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index 87c057e..aa8bb10 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -78,8 +78,9 @@ def dump_host(hostname): (addresses if addresses is not None else "No IP") + "\n") tag_template = tty.bold + "[" + tty.normal + "%s" + tty.bold + "]" + tty.normal - tags = [(tag_template % ":".join(t)) - for t in sorted(config_cache.tag_groups_of_host(hostname).items())] + tags = [ + (tag_template % ":".join(t)) for t in sorted(config_cache.tags_of_host(hostname).items()) + ] console.output(tty.yellow + "Tags: " + tty.normal + ", ".join(tags) + "\n") if config.is_cluster(hostname): parents_list = config.nodes_of(hostname) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 526fb82..f572b33 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -243,11 +243,11 @@ def test_host_tags_of_host(monkeypatch): cfg = config.HostConfig("xyz") assert cfg.tag_groups == {} - assert config.get_config_cache().tag_groups_of_host("xyz") == {} + assert config.get_config_cache().tags_of_host("xyz") == {} cfg = config.HostConfig("test-host") assert cfg.tag_groups == {"tag_group": "abc"} - assert config.get_config_cache().tag_groups_of_host("test-host") == {"tag_group": "abc"} + assert config.get_config_cache().tags_of_host("test-host") == {"tag_group": "abc"} def test_service_tag_rules_default():

5 years, 3 months

7334 FIX Prevent tag groups with a single choice (checkbox) and empty tag ID

by Lars Michelsen

Module: check_mk Branch: master Commit: 49301cf591e919f9c0c4de17596d268a75b8d4a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49301cf591e919… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 08:49:34 2019 +0200 7334 FIX Prevent tag groups with a single choice (checkbox) and empty tag ID In previous versions it was possible to create tag groups that had a single choice (shown as checkbox) and an empty tag ID for this single choice. This was not intended and was not usable at all. The tag management GUI and API calls are now preventing this configuration. Change-Id: I59bbbd63a909f14c8f0c0b07b4cc7ab344ef4f6a --- .werks/7334 | 14 ++++++++++++++ cmk/gui/tags.py | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/.werks/7334 b/.werks/7334 new file mode 100644 index 0000000..8ac2b22 --- /dev/null +++ b/.werks/7334 @@ -0,0 +1,14 @@ +Title: Prevent tag groups with a single choice (checkbox) and empty tag ID +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1554216866 + +In previous versions it was possible to create tag groups that had a single +choice (shown as checkbox) and an empty tag ID for this single choice. This +was not intended and was not usable at all. The tag management GUI and API +calls are now preventing this configuration. diff --git a/cmk/gui/tags.py b/cmk/gui/tags.py index 51da12c..7a194d9 100644 --- a/cmk/gui/tags.py +++ b/cmk/gui/tags.py @@ -467,10 +467,17 @@ class TagConfig(object): if tag.id or tag.title: if not tag.id: tag.id = None + + if len(tag_group.tags) == 1: + raise MKUserError("choices_%d_id" % (nr + 1), + _("Can not use an empty tag ID with a single choice.")) + if have_none_tag: raise MKUserError("choices_%d_id" % (nr + 1), _("Only one tag may be empty.")) + have_none_tag = True + # Make sure tag ID is unique within this group for (n, x) in enumerate(tag_group.tags): if n != nr and x.id == tag.id:

5 years, 3 months

Fixed wrong shebang: Did not use site python environment

by Lars Michelsen

Module: check_mk Branch: master Commit: 49f8ed7781cf814e0fb1137bcf291efda4503ec1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49f8ed7781cf81… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 08:30:19 2019 +0200 Fixed wrong shebang: Did not use site python environment Change-Id: Ib971a7a200e6c0b4fdd3928fde5b890207273012 --- agents/special/agent_elasticsearch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_elasticsearch b/agents/special/agent_elasticsearch index eca830f..5d85383 100755 --- a/agents/special/agent_elasticsearch +++ b/agents/special/agent_elasticsearch @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ |

5 years, 3 months

apache_status: small refactoring to be prepared for new feature

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7eafdc10d29c42bc82115ed73845fb7f9c44e3f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7eafdc10d29c42… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 3 07:59:59 2019 +0200 apache_status: small refactoring to be prepared for new feature Change-Id: I0139d16bcf34e4e72d485dc4677b17c68c5b0a2b --- agents/plugins/apache_status | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index ce5b28f..a861619 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -126,27 +126,26 @@ def _unpack_server(server): server.get('page', 'server-status')) -def urlopen_no_cert_verification(url): - """urlopen without checking the cert +def get_ssl_context(address): + """return the appropriate SSL context - workaround if SSL port is found and localhost is using - SSL connections but certificate does not match + * for local addresses ignore the Certificate """ context = ssl.create_default_context() - context.check_hostname = False - context.verify_mode = ssl.CERT_NONE - return urllib2.urlopen(url, context=context) + is_local = address in ("127.0.0.1", "[::1]", "localhost") + if is_local: + context.check_hostname = False + context.verify_mode = ssl.CERT_NONE + return context def get_response(proto, address, portspec, page): - is_local = address in ("127.0.0.1", "[::1]", "localhost") url = '%s://%s%s/%s?auto' % (proto, address, portspec, page) + request = urllib2.Request(url, headers={"Accept": "text/plain"}) + ssl_context = get_ssl_context(address) # Try to fetch the status page for each server try: - request = urllib2.Request(url, headers={"Accept": "text/plain"}) - if is_local: - return urlopen_no_cert_verification(url) - return urllib2.urlopen(request) + return urllib2.urlopen(request, context=ssl_context) except urllib2.URLError as exc: if 'unknown protocol' in str(exc): # HACK: workaround misconfigurations where port 443 is used for

5 years, 3 months

7388 FIX cisco_temperature: Non-functioning devices are now treated as CRIT instead of UNKNOWN

by Moritz Kiemer

Module: check_mk Branch: master Commit: b8d4ce64f99c72b0d215b795ac95bc079f7e68e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8d4ce64f99c72… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 2 12:01:32 2019 +0200 7388 FIX cisco_temperature: Non-functioning devices are now treated as CRIT instead of UNKNOWN CMK-1849 Change-Id: Idf3a290d232954bc668e36c8a54cee4041fbcfc7 --- .werks/7388 | 10 ++++++++++ checks/cisco_temperature | 4 +--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.werks/7388 b/.werks/7388 new file mode 100644 index 0000000..3b5870b --- /dev/null +++ b/.werks/7388 @@ -0,0 +1,10 @@ +Title: cisco_temperature: Non-functioning devices are now treated as CRIT instead of UNKNOWN +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554199236 +Class: fix + + diff --git a/checks/cisco_temperature b/checks/cisco_temperature index 4b5409f..67c7f8b 100644 --- a/checks/cisco_temperature +++ b/checks/cisco_temperature @@ -83,7 +83,7 @@ def parse_cisco_temperature(info): '3': (2, "critical"), '4': (2, "shutdown"), '5': (3, "not present"), - '6': (3, "not functioning"), # TODO: fix this to CRIT + '6': (2, "not functioning"), } description_info, state_info, levels_info, perfstuff = info @@ -123,8 +123,6 @@ def parse_cisco_temperature(info): 'dev_state': map_states.get(sensorstate, (3, 'unknown[%s]' % sensorstate)) } - # TODO: entity_parsed contains sensors with status OK only and means sensors with non-OK - # status are not inventorized. if sensorstate == '1': scale = 10**int(magnitude) scale *= 10**(-1 * cisco_entity_exponents[scalecode])

5 years, 3 months

Let me format this for you...

by Lars Michelsen

Module: check_mk Branch: master Commit: 6835a5999c317933841058e6aa28596be246d29c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6835a5999c3179… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 17:00:23 2019 +0200 Let me format this for you... https://www.pianojoe.de/code/simpsongenerator/creator/create.php?w=I+will+n… Change-Id: I7c145da9b563edbd0c4dfed38f1ef7d5553bb01b --- checks/oracle_performance | 14 +++++++------- cmk/gui/plugins/metrics/check_mk.py | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/checks/oracle_performance b/checks/oracle_performance index 3fcddf5..a70d400 100644 --- a/checks/oracle_performance +++ b/checks/oracle_performance @@ -106,13 +106,13 @@ def check_oracle_performance(item, _no_params, parsed): sga_info = data.get('SGA_info', None) if sga_info: for what, val, perfvar in [ - ('SGA', sga_info["Maximum SGA Size"], 'oracle_sga_size'), - ('DB Cache', sga_info["Buffer Cache Size"], 'oracle_sga_buffer_cache'), - ('Shared Pool', sga_info["Shared Pool Size"], 'oracle_sga_shared_pool'), - ('Redo Buffers', sga_info["Redo Buffers"], 'oracle_sga_redo_buffer'), - ('Java Pool Size', sga_info["Java Pool Size"], 'oracle_sga_java_pool'), - ('Large Pool Size', sga_info["Large Pool Size"], 'oracle_sga_large_pool'), - ('Streams Pool Size', sga_info["Streams Pool Size"], 'oracle_sga_streams_pool'), + ('SGA', sga_info["Maximum SGA Size"], 'oracle_sga_size'), + ('DB Cache', sga_info["Buffer Cache Size"], 'oracle_sga_buffer_cache'), + ('Shared Pool', sga_info["Shared Pool Size"], 'oracle_sga_shared_pool'), + ('Redo Buffers', sga_info["Redo Buffers"], 'oracle_sga_redo_buffer'), + ('Java Pool Size', sga_info["Java Pool Size"], 'oracle_sga_java_pool'), + ('Large Pool Size', sga_info["Large Pool Size"], 'oracle_sga_large_pool'), + ('Streams Pool Size', sga_info["Streams Pool Size"], 'oracle_sga_streams_pool'), ]: yield 0, "%s: %s" % (what, get_bytes_human_readable(val)) perfdata.append((perfvar, val)) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 4b19550..2187ca5 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4337,20 +4337,20 @@ def register_oracle_metrics(): "color": color, } - for what, descr, unit, color in [ - ("oracle_sga_size","SGA","bytes", "11/a"), - ("oracle_sga_buffer_cache","Buffer Cache","bytes", "15/a"), - ("oracle_sga_shared_pool","Shared Pool","bytes", "21/a"), - ("oracle_sga_redo_buffer","Redo Buffer","bytes", "43/b"), - ("oracle_sga_java_pool","Java Pool","bytes", "26/a"), - ("oracle_sga_large_pool","Large Pool","bytes", "14/a"), - ("oracle_sga_streams_pool","Streams Pool","bytes", "16/a")]: + for what, descr, unit, color in [("oracle_sga_size", "SGA", "bytes", "11/a"), + ("oracle_sga_buffer_cache", "Buffer Cache", "bytes", "15/a"), + ("oracle_sga_shared_pool", "Shared Pool", "bytes", "21/a"), + ("oracle_sga_redo_buffer", "Redo Buffer", "bytes", "43/b"), + ("oracle_sga_java_pool", "Java Pool", "bytes", "26/a"), + ("oracle_sga_large_pool", "Large Pool", "bytes", "14/a"), + ("oracle_sga_streams_pool", "Streams Pool", "bytes", "16/a")]: metric_info["%s" % what] = { "title": _("ORACLE %s") % descr, "unit": unit, "color": color, } + register_oracle_metrics() metric_info["dhcp_discovery"] = { @@ -10473,13 +10473,13 @@ graph_info["oracle_library_cache_statistics"] = { graph_info["oracle_sga_info"] = { "title": _("ORACLE SGA Information"), "metrics": [ - ("oracle_sga_size","line"), + ("oracle_sga_size", "line"), ("oracle_sga_buffer_cache", "stack"), - ("oracle_sga_shared_pool","stack"), - ("oracle_sga_redo_buffer","stack"), - ("oracle_sga_java_pool","stack"), - ("oracle_sga_large_pool","stack"), - ("oracle_sga_streams_pool","stack"), + ("oracle_sga_shared_pool", "stack"), + ("oracle_sga_redo_buffer", "stack"), + ("oracle_sga_java_pool", "stack"), + ("oracle_sga_large_pool", "stack"), + ("oracle_sga_streams_pool", "stack"), ], "optional_metrics": [ "oracle_sga_java_pool",

5 years, 3 months

Fixed no-member access in exception handler

by Lars Michelsen

Module: check_mk Branch: master Commit: 8f427c223338108018d85a06c2ea7b02d329a673 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f427c22333810… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 16:43:29 2019 +0200 Fixed no-member access in exception handler Change-Id: I571cb8d1dcabae2d8b379a1547e3585056f20b4a --- cmk/ec/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 0fa5135..2a16fb1 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -232,7 +232,7 @@ class ECServerThread(threading.Thread): self.serve() except Exception: self._logger.exception("Exception in %s server" % self.name) - if self._settings.options.debug: + if self.settings.options.debug: raise time.sleep(1)

5 years, 3 months

Tiny style improvement.

by Sven Panne

Module: check_mk Branch: master Commit: 319e2d04556f28aad7b081e6a35dde27ec7c2579 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=319e2d04556f28… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 2 15:45:40 2019 +0200 Tiny style improvement. Change-Id: I4101c58a034df63f2c00061c2127ffb526e774e0 --- livestatus/src/test/test_OffsetStringMacroColumn.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/test/test_OffsetStringMacroColumn.cc b/livestatus/src/test/test_OffsetStringMacroColumn.cc index 08898b3..d52b003 100644 --- a/livestatus/src/test/test_OffsetStringMacroColumn.cc +++ b/livestatus/src/test/test_OffsetStringMacroColumn.cc @@ -134,7 +134,7 @@ TEST_F(OffsetStringMacroColumnTest, getValue_border_cases) { set_host_notes("checking $HOSTNAME$..."); EXPECT_EQ("checking $HOSTNAME$...", expanded_host_notes()); - host_.notes = nullptr; + set_host_notes(nullptr); EXPECT_EQ("", expanded_host_notes()); set_host_notes("");

5 years, 3 months

← Newer
1
...
50
51
52
53
54
55
56
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019