Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Fixed ValueError exception when configuring virtual host trees

by Lars Michelsen

Module: check_mk Branch: master Commit: b9cc5772ccd8218cecb0acb3d4854148ea1b22dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9cc5772ccd821… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 08:05:54 2017 +0100 Fixed ValueError exception when configuring virtual host trees Change-Id: I886b46ffd0217d7eec5b49714c92827fb932bdda --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 169c209..37bc340 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -358,7 +358,7 @@ def wato_host_tag_group_choices(): # Now search for checkbox-only-topics for topic, entries in by_topic.items(): for entry in entries: - tgid, title, tags = entry + tgid, title, tags = entry[:3] if len(tags) != 1: break else:

6 years, 7 months

Renamed new best practice page to Analyze configuration

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f9bfda59348f8d26043df755aaa6f4f97f483ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f9bfda59348f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 21 16:49:06 2017 +0100 Renamed new best practice page to Analyze configuration Change-Id: I153d9f072e9010e45f4dd5d7bafe03efc820c377 --- .werks/5531 | 4 +- ..._best_practices.png => icon_analyze_config.png} | Bin web/htdocs/wato.css | 18 +-- web/htdocs/wato.py | 44 +++---- web/htdocs/watolib.py | 58 ++------- web/plugins/wato/bp_tests.py | 143 +++++++++++++-------- web/plugins/wato/builtin_modules.py | 2 +- 7 files changed, 134 insertions(+), 135 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7f9bfda593…

6 years, 7 months

Fix typo

by Konstantin Büttner

Module: check_mk Branch: master Commit: d64c1e2ca0db84d61cb819eb217e337d73ee1761 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d64c1e2ca0db84… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Nov 21 18:06:30 2017 +0100 Fix typo Change-Id: I533d717ec504ef266a7974a24f8a0d09bc878dd7 --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 63431b7..3febb57 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6814,7 +6814,7 @@ register_check_parameters( Tuple( title = _("FIN_WAIT1"), help = _("our socket has closed; we are in the process of " - "tiering down the connection"), + "tearing down the connection"), elements = [ Integer(title = _("Warning at"), label = _("connections")), Integer(title = _("Critical at"), label = _("connections"))

6 years, 7 months

5519 ddn_s2a_errors, ddn_s2a_faultsbasic, ddn_s2a_faultsbasic.bootstatus, ddn_s2a_faultsbasic.cachecoh, ddn_s2a_faultsbasic.disks, ddn_s2a_faultsbasic.dualcomm, ddn_s2a_faultsbasic.ethernet, ddn_s2a_faultsbasic.fans, ddn_s2a_faultsbasic.pingfault, ddn_s2a_faultsbasic.ps, ddn_s2a_faultsbasic.temp, ddn_s2a_stats, ddn_s2a_stats.io, ddn_s2a_stats.readhits, ddn_s2a_statsdelay, ddn_s2a_uptime, ddn_s2a_version: Suite of checks to monitor DDN S2A storage devices

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0cf954a4952d8514cf298137191fffbd08452175 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cf954a4952d85… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 20 14:35:16 2017 +0100 5519 ddn_s2a_errors, ddn_s2a_faultsbasic, ddn_s2a_faultsbasic.bootstatus, ddn_s2a_faultsbasic.cachecoh, ddn_s2a_faultsbasic.disks, ddn_s2a_faultsbasic.dualcomm, ddn_s2a_faultsbasic.ethernet, ddn_s2a_faultsbasic.fans, ddn_s2a_faultsbasic.pingfault, ddn_s2a_faultsbasic.ps, ddn_s2a_faultsbasic.temp, ddn_s2a_stats, ddn_s2a_stats.io, ddn_s2a_stats.readhits, ddn_s2a_statsdelay, ddn_s2a_uptime, ddn_s2a_version: Suite of checks to monitor DDN S2A storage devices These checks use the agent_ddn_s2a datasource program. Change-Id: Ib0ed7c1978c14134f561024b06a381618be040f2 --- .werks/5519 | 10 + agents/special/agent_ddn_s2a | 78 ++++++ checkman/ddn_s2a_errors | 26 ++ checkman/ddn_s2a_faultsbasic | 15 ++ checkman/ddn_s2a_faultsbasic.bootstatus | 14 ++ checkman/ddn_s2a_faultsbasic.cachecoh | 14 ++ checkman/ddn_s2a_faultsbasic.disks | 13 + checkman/ddn_s2a_faultsbasic.dualcomm | 14 ++ checkman/ddn_s2a_faultsbasic.ethernet | 14 ++ checkman/ddn_s2a_faultsbasic.fans | 13 + checkman/ddn_s2a_faultsbasic.pingfault | 14 ++ checkman/ddn_s2a_faultsbasic.ps | 14 ++ checkman/ddn_s2a_faultsbasic.temp | 13 + checkman/ddn_s2a_stats | 13 + checkman/ddn_s2a_stats.io | 13 + checkman/ddn_s2a_stats.readhits | 13 + checkman/ddn_s2a_statsdelay | 14 ++ checkman/ddn_s2a_uptime | 14 ++ checkman/ddn_s2a_version | 13 + checks/agent_ddn_s2a | 33 +++ checks/ddn_s2a.include | 40 +++ checks/ddn_s2a_errors | 123 ++++++++++ checks/ddn_s2a_faultsbasic | 419 ++++++++++++++++++++++++++++++++ checks/ddn_s2a_stats | 240 ++++++++++++++++++ checks/ddn_s2a_statsdelay | 167 +++++++++++++ checks/ddn_s2a_uptime | 56 +++++ checks/ddn_s2a_version | 48 ++++ web/plugins/metrics/check_mk.py | 42 +++- web/plugins/wato/check_parameters.py | 221 +++++++++++++++++ web/plugins/wato/datasource_programs.py | 24 ++ 30 files changed, 1743 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0cf954a495…

6 years, 7 months

Fixed side effect of data source tests: debug mode was left enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 1f67dee389a4e01080ca7599441b437c99ec4e23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f67dee389a4e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 21 16:32:46 2017 +0100 Fixed side effect of data source tests: debug mode was left enabled Change-Id: Ica5c385d4b329a923b8eee3023fdfebffd69bc66 --- tests/cmk_base/test_data_sources.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/cmk_base/test_data_sources.py b/tests/cmk_base/test_data_sources.py index 9fb3803..3e35394 100644 --- a/tests/cmk_base/test_data_sources.py +++ b/tests/cmk_base/test_data_sources.py @@ -60,6 +60,8 @@ def test_cfg(web, site): # print "Cleaning up test config" + cmk.debug.disable() + site.delete_dir("var/check_mk/agent_output") site.delete_file("etc/check_mk/conf.d/ds-test-host.mk")

6 years, 7 months

5520 FIX rstcli, rstcli.pdisks: Fix broken parse function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0b4affeb95540d830fbafccd3aa688f46c4f8ae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b4affeb95540d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Nov 21 15:48:32 2017 +0100 5520 FIX rstcli, rstcli.pdisks: Fix broken parse function Some unexpected lines in the corresponding agent section could lead to neither check nor discovery working (ie crashing). This has been fixed for all known cases. Change-Id: Ibdcea18161f05dec47f1fc50c348873e11f7ba5b --- .werks/5520 | 13 +++++++++++++ checks/rstcli | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/.werks/5520 b/.werks/5520 new file mode 100644 index 0000000..f7ac77a --- /dev/null +++ b/.werks/5520 @@ -0,0 +1,13 @@ +Title: rstcli, rstcli.pdisks: Fix broken parse function +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1511275342 + +Some unexpected lines in the corresponding agent section could lead to +neither check nor discovery working (ie crashing). This has been fixed +for all known cases. diff --git a/checks/rstcli b/checks/rstcli index 25694a5..e900720 100644 --- a/checks/rstcli +++ b/checks/rstcli @@ -71,6 +71,10 @@ def parse_rstcli_sections(info): if current_section is not None: yield current_section current_section = (":".join(line).strip("-").strip(), []) + elif len(line) < 2: + # On some systems, there are lines that only consist of + # a contextless 0. Skip those to avoid parsing errors later. + continue else: if current_section is None: raise MKGeneralException("error: %s" % " ".join(line))

6 years, 7 months

Updated bug entries #3013

by Lars Michelsen

Module: check_mk Branch: master Commit: a9f6dc44fb6f9502803d968c75895a8f0ef4706a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9f6dc44fb6f95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 17 10:57:15 2017 +0100 Updated bug entries #3013 Change-Id: Ice1940b193defefa70f64cd1376eb13cc8806264 --- .bugs/3013 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/3013 b/.bugs/3013 new file mode 100644 index 0000000..e900eaa --- /dev/null +++ b/.bugs/3013 @@ -0,0 +1,12 @@ +Title: Improve performance of some pages (using automations) +Component: wato +State: open +Date: 2017-11-17 10:55:13 +Targetversion: 1.5.0 +Class: bug + +Some pages that rely on Check_MK automation calls are terrible slow. For example +the rule editor of the "Check intervals for SNMP checks" is slow because the +automation call that is used to list the check of Check_MK is called 4 times +when rendering the page. This should really be cached on any layer, maybe in the +valuespec itself.

6 years, 7 months

Fixed merging sections from cluster nodes for cluster hosts together

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ed469e44b43e4a5d99a7d23c094e943a5ed31bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ed469e44b43e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 20 13:10:22 2017 +0100 Fixed merging sections from cluster nodes for cluster hosts together Change-Id: Idd0ba73da88cf7e2411bb28dbfff588281f64198 --- cmk_base/data_sources/__init__.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index d8eacb7..de441d4 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -168,23 +168,29 @@ def get_info_for_check(all_host_infos, hostname, ipaddress, check_type, for_disc else: host_entries.append((hostname, ipaddress)) - # Now extract the sections of the relevant hosts and optionally add the node info - info = None + # Now get the section_content from the required hosts and merge them together to + # a single section_content. For each host optionally add the node info. + section_content = None for host_entry in host_entries: try: - info = all_host_infos[host_entry].info[section_name] + host_section_content = all_host_infos[host_entry].info[section_name] except KeyError: continue - info = _update_info_with_node_info(info, check_type, host_entry[0], for_discovery) - info = _update_info_with_parse_function(info, section_name) + host_section_content = _update_info_with_node_info(host_section_content, check_type, host_entry[0], for_discovery) - if info is None: + if section_content is None: + section_content = [] + + section_content += host_section_content + + if section_content is None: return None - info = _update_info_with_extra_sections(info, all_host_infos, hostname, ipaddress, section_name, for_discovery) + section_content = _update_info_with_parse_function(section_content, section_name) + section_content = _update_info_with_extra_sections(section_content, all_host_infos, hostname, ipaddress, section_name, for_discovery) - return info + return section_content def _update_info_with_node_info(info, check_type, hostname, for_discovery):

6 years, 7 months

Added helpful message when viewing the service discovery page of clusters which have no services

by Lars Michelsen

Module: check_mk Branch: master Commit: 74c6f6ee6c3709d2a29d21db9eb58c158fb03891 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74c6f6ee6c3709… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 17 13:57:56 2017 +0100 Added helpful message when viewing the service discovery page of clusters which have no services Change-Id: I475d48498d6c86b942dd70e255bdb7b882cbddc7 --- web/htdocs/wato.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2bf513a..ae36e06 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2818,7 +2818,7 @@ class ModeDiscovery(WatoMode): ("mode", "object_parameters"), ("host", self._host_name)]), "rulesets") if self._host.is_cluster(): - html.context_button(_("Clustered Services"), + html.context_button(_("Clustered services"), watolib.folder_preserving_link([("mode", "edit_ruleset"), ("varname", "clustered_services")]), "rulesets") @@ -2917,6 +2917,15 @@ class ModeDiscovery(WatoMode): (_("Service discovery failed for this host"), e, retry_link)) return + if not check_table and self._host.is_cluster(): + url = watolib.folder_preserving_link([("mode", "edit_ruleset"), + ("varname", "clustered_services")]) + html.show_info(_("Could not find any service for your cluster. You first need to " + "specify which services of your nodes shal be added to the " + "cluster. This is done using the <a href=\"%s\">%s</a> ruleset.") % + (url, _("Clustered services"))) + return + map_icons = {self.SERVICE_UNDECIDED: "undecided", self.SERVICE_MONITORED: "monitored", self.SERVICE_IGNORED: "disabled"}

6 years, 7 months

Moved persisted info update logic to DataSource()

by Lars Michelsen

Module: check_mk Branch: master Commit: ef654aabf1a316692fe4b695cafe837c63b9d249 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef654aabf1a316… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 17 11:10:34 2017 +0100 Moved persisted info update logic to DataSource() Change-Id: I8496b2a0ffadfa89734db2a6a0247178250b01f8 --- cmk_base/data_sources/abstract.py | 29 +++++++++++++++++++++-------- cmk_base/data_sources/host_info.py | 17 +---------------- cmk_base/data_sources/tcp.py | 2 +- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index d17c938..7597d58 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -333,6 +333,27 @@ class DataSource(object): self._logger.debug("[%s] Stored persisted sections: %s" % (self.id(), ", ".join(persisted_info.keys()))) + def _update_info_with_persisted_info(self, host_info, hostname): + persisted_info = self._load_persisted_info(hostname) + if not persisted_info: + return host_info + + for section_name, entry in persisted_info.items(): + if len(entry) == 2: + continue # Skip entries of "old" format + + persisted_from, persisted_until, section_info = entry + + # Don't overwrite sections that have been received from the source with this call + if section_name not in host_info.info: + self._logger.debug("[%s] Using persisted section %r" % (self.id(), section_name)) + host_info.add_cached_section(section_name, section_info, persisted_from, persisted_until) + else: + self._logger.debug("[%s] Skipping persisted section %r" % (self.id(), section_name)) + + return host_info + + def _load_persisted_info(self, hostname): file_path = self._persisted_info_file_path(hostname) @@ -377,14 +398,6 @@ class DataSource(object): return persisted_info - def _update_info_with_persisted_info(self, host_info, hostname): - persisted_info = self._load_persisted_info(hostname) - if persisted_info: - host_info.update_with_persisted_info(persisted_info, - use_outdated_sections=self._use_outdated_persisted_sections) - return host_info - - @classmethod def use_outdated_persisted_sections(cls): cls._use_outdated_persisted_sections = True diff --git a/cmk_base/data_sources/host_info.py b/cmk_base/data_sources/host_info.py index b51d490..b22f715 100644 --- a/cmk_base/data_sources/host_info.py +++ b/cmk_base/data_sources/host_info.py @@ -68,21 +68,6 @@ class HostInfo(object): self.persisted_info.update(host_info.persisted_info) - def _add_cached_section(self, section_name, section, persisted_from, persisted_until): + def add_cached_section(self, section_name, section, persisted_from, persisted_until): self.cache_info[section_name] = (persisted_from, persisted_until - persisted_from) self.info[section_name] = section - - - def update_with_persisted_info(self, persisted_info, use_outdated_sections): - for section_name, entry in persisted_info.items(): - if len(entry) == 2: - continue # Skip entries of "old" format - - persisted_from, persisted_until, section_info = entry - - # Don't overwrite sections that have been received from the source with this call - if section_name not in self.info: - console.vverbose("Using persisted section %r\n" % section_name) - self._add_cached_section(section_name, section_info, persisted_from, persisted_until) - else: - console.vverbose("Skipping persisted section %r\n" % section_name) diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index 6827600..bc57405 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -86,7 +86,7 @@ class TCPDataSource(CheckMKAgentDataSource): socket.SOCK_STREAM) s.settimeout(config.tcp_connect_timeout) - console.vverbose("Connecting via TCP to %s:%d.\n" % (ipaddress, port)) + self._logger.debug("[%s] Connecting via TCP to %s:%d" % (self.id(), ipaddress, port)) s.connect((ipaddress, port)) # Immediately close sending direction. We do not send any data # s.shutdown(socket.SHUT_WR)

6 years, 7 months

← Newer
1
...
11
12
13
14
15
16
17
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017