Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

6052 FIX Show "Agent updates" context menu only for permitted users

by Lars Michelsen

Module: check_mk Branch: master Commit: 4dcb2cb479bc451eeb018c93f4cf8caf0acea5c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dcb2cb479bc45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 30 08:30:02 2018 +0200 6052 FIX Show "Agent updates" context menu only for permitted users The "Agent updates" context menu entry of the "Check_MK Agent" service is now only shown when the user is permitted to access the target page. Change-Id: I119672849f9bbd17870bcc82ea8fdb3942c94c2e --- .werks/6052 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/6052 b/.werks/6052 new file mode 100644 index 0000000..09d965a --- /dev/null +++ b/.werks/6052 @@ -0,0 +1,12 @@ +Title: Show "Agent updates" context menu only for permitted users +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1525069756 + +The "Agent updates" context menu entry of the "Check_MK Agent" service +is now only shown when the user is permitted to access the target page.

6 years, 5 months

6049 FIX docker_node_disk_usage: Fixed crash when docker process is not running

by Lars Michelsen

Module: check_mk Branch: master Commit: e37ecf70f20c5813b0db85f806cfed647647e35a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e37ecf70f20c58… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Apr 29 19:59:23 2018 +0200 6049 FIX docker_node_disk_usage: Fixed crash when docker process is not running Change-Id: I8d086ac8ff10ab5d28b335514ca3a7ea55b3b297 --- .werks/6049 | 11 +++++++++++ checks/docker_node_disk_usage | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6049 b/.werks/6049 new file mode 100644 index 0000000..cf41a3b --- /dev/null +++ b/.werks/6049 @@ -0,0 +1,11 @@ +Title: docker_node_disk_usage: Fixed crash when docker process is not running +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525024748 + + diff --git a/checks/docker_node_disk_usage b/checks/docker_node_disk_usage index 0038a6d..816ac69 100644 --- a/checks/docker_node_disk_usage +++ b/checks/docker_node_disk_usage @@ -53,7 +53,7 @@ def inventory_docker_node_disk_usage(parsed): def check_docker_node_disk_usage(item, params, parsed): data = parsed.get(item) if data is None: - yield 3, "no data" + return for key, param, conversion_func in ( ('Size', 'size', get_filesize_human_readable),

6 years, 5 months

Removed dangling symlinks

by Lars Michelsen

Module: check_mk Branch: master Commit: 0dd98b0b3c1d946042ec39d3b70cbc9343fcabd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dd98b0b3c1d94… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 20:06:46 2018 +0200 Removed dangling symlinks Change-Id: Ia217e02b51dfc2755fa977660c268cd78964b5a8 --- pnp-templates/check_mk-esx_vsphere_counters.if.php | 1 - pnp-templates/check_mk-fritz.wan_if.php | 1 - pnp-templates/check_mk-hitachi_hnas_fc_if.php | 1 - pnp-templates/check_mk-hpux_if.php | 1 - pnp-templates/check_mk-if64.php | 1 - pnp-templates/check_mk-if64_tplink.php | 1 - pnp-templates/check_mk-if64adm.php | 1 - pnp-templates/check_mk-if_lancom.php | 1 - pnp-templates/check_mk-lnx_if.php | 1 - pnp-templates/check_mk-mcdata_fcport.php | 1 - pnp-templates/check_mk-netapp_api_if.php | 1 - pnp-templates/check_mk-statgrab_net.php | 1 - pnp-templates/check_mk-ucs_bladecenter_if.php | 1 - pnp-templates/check_mk-vms_if.php | 1 - pnp-templates/check_mk-winperf_if.php | 1 - 15 files changed, 15 deletions(-) diff --git a/pnp-templates/check_mk-esx_vsphere_counters.if.php b/pnp-templates/check_mk-esx_vsphere_counters.if.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-esx_vsphere_counters.if.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-fritz.wan_if.php b/pnp-templates/check_mk-fritz.wan_if.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-fritz.wan_if.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hitachi_hnas_fc_if.php b/pnp-templates/check_mk-hitachi_hnas_fc_if.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-hitachi_hnas_fc_if.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_if.php b/pnp-templates/check_mk-hpux_if.php deleted file mode 120000 index ae6f933..0000000 --- a/pnp-templates/check_mk-hpux_if.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if64.php \ No newline at end of file diff --git a/pnp-templates/check_mk-if64.php b/pnp-templates/check_mk-if64.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-if64.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-if64_tplink.php b/pnp-templates/check_mk-if64_tplink.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-if64_tplink.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-if64adm.php b/pnp-templates/check_mk-if64adm.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-if64adm.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-if_lancom.php b/pnp-templates/check_mk-if_lancom.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-if_lancom.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-lnx_if.php b/pnp-templates/check_mk-lnx_if.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-lnx_if.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-mcdata_fcport.php b/pnp-templates/check_mk-mcdata_fcport.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-mcdata_fcport.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-netapp_api_if.php b/pnp-templates/check_mk-netapp_api_if.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-netapp_api_if.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-statgrab_net.php b/pnp-templates/check_mk-statgrab_net.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-statgrab_net.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-ucs_bladecenter_if.php b/pnp-templates/check_mk-ucs_bladecenter_if.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-ucs_bladecenter_if.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-vms_if.php b/pnp-templates/check_mk-vms_if.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-vms_if.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file diff --git a/pnp-templates/check_mk-winperf_if.php b/pnp-templates/check_mk-winperf_if.php deleted file mode 120000 index 9a34dce..0000000 --- a/pnp-templates/check_mk-winperf_if.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-if.php \ No newline at end of file

6 years, 5 months

6043 FIX Fixed HW/SW inventory marking discovered services as vanished

by Lars Michelsen

Module: check_mk Branch: master Commit: 25885b3bafe9de50645b77b0620ad74268949a1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25885b3bafe9de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 19:18:30 2018 +0200 6043 FIX Fixed HW/SW inventory marking discovered services as vanished The service discovery (e.g. WATO service discovery page) could be confused after the execution of the HW/SW inventory check. When opening the service discovery page for a host with SNMP services, the page could show still existing services as vanished. CMK-504 #close Fixed Change-Id: I16871254bb9bb13df094568baf0bd61cef8fa917 --- .werks/6043 | 15 +++++++++++ cmk_base/data_sources/abstract.py | 8 ++++-- tests/unit/cmk_base/test_data_sources_unit.py | 36 +++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/.werks/6043 b/.werks/6043 new file mode 100644 index 0000000..a961cbe --- /dev/null +++ b/.werks/6043 @@ -0,0 +1,15 @@ +Title: Fixed HW/SW inventory marking discovered services as vanished +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524849172 + +The service discovery (e.g. WATO service discovery page) could be +confused after the execution of the HW/SW inventory check. + +When opening the service discovery page for a host with SNMP services, +the page could show still existing services as vanished. diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index c3c1e3e..c1f39cb 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -226,7 +226,7 @@ class DataSource(object): self._logger.debug("Not using cache (Does not exist)") return - if self._no_cache: + if self.is_agent_cache_disabled(): self._logger.debug("Not using cache (Cache usage disabled)") return @@ -252,6 +252,10 @@ class DataSource(object): def _write_cache_file(self, raw_data): + if self.is_agent_cache_disabled(): + self._logger.debug("Not writing data to cache file (Cache usage disabled)") + return + cachefile = self._cache_file_path() try: @@ -265,7 +269,7 @@ class DataSource(object): except Exception, e: raise MKGeneralException("Cannot create directory %r: %s" % (os.path.dirname(cachefile), e)) - self._logger.verbose("Write data to cache file %s" % (cachefile)) + self._logger.debug("Write data to cache file %s" % (cachefile)) try: store.save_file(cachefile, self._to_cache_file(raw_data)) except Exception, e: diff --git a/tests/unit/cmk_base/test_data_sources_unit.py b/tests/unit/cmk_base/test_data_sources_unit.py new file mode 100644 index 0000000..65503ef --- /dev/null +++ b/tests/unit/cmk_base/test_data_sources_unit.py @@ -0,0 +1,36 @@ +import pytest + +import cmk_base.data_sources.snmp + +def test_data_source_cache_default(): + source = cmk_base.data_sources.snmp.SNMPDataSource("hostname", "ipaddress") + assert not source.is_agent_cache_disabled() + + +def test_disable_data_source_cache(): + source = cmk_base.data_sources.snmp.SNMPDataSource("hostname", "ipaddress") + assert not source.is_agent_cache_disabled() + source.disable_data_source_cache() + assert source.is_agent_cache_disabled() + + +def test_disable_data_source_cache_no_read(mocker): + source = cmk_base.data_sources.snmp.SNMPDataSource("hostname", "ipaddress") + source.set_max_cachefile_age(999) + source.disable_data_source_cache() + + import os + mocker.patch.object(os.path, "exists", return_value=True) + + disabled_checker = mocker.patch.object(source, "is_agent_cache_disabled") + assert source._read_cache_file() is None + disabled_checker.assert_called_once() + + +def test_disable_data_source_cache_no_write(mocker): + source = cmk_base.data_sources.snmp.SNMPDataSource("hostname", "ipaddress") + source.disable_data_source_cache() + + disabled_checker = mocker.patch.object(source, "is_agent_cache_disabled") + assert source._write_cache_file("X") is None + disabled_checker.assert_called_once()

6 years, 5 months

6041 FIX Discovery: Exceptions during discovery produce crash reports again

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a4c0486cd35838e09e9f9950f475f959bf8b8d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a4c0486cd3583… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 17:15:39 2018 +0200 6041 FIX Discovery: Exceptions during discovery produce crash reports again It is intended that exceptions during service discovery lead to crash reports instead of less helpful UNKOWN states with missing trace information. This broke somewhere on the way to 1.5. Change-Id: If1c0d9a2186a0cce45c679b3aaf15ed55b8b48eb --- .werks/6041 | 13 +++++++++++++ cmk_base/checking.py | 2 +- cmk_base/discovery.py | 7 ++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/6041 b/.werks/6041 new file mode 100644 index 0000000..de63e2a --- /dev/null +++ b/.werks/6041 @@ -0,0 +1,13 @@ +Title: Discovery: Exceptions during discovery produce crash reports again +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524842047 + +It is intended that exceptions during service discovery lead to crash reports +instead of less helpful UNKOWN states with missing trace information. This broke +somewhere on the way to 1.5. diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 695cca3..c338d1a 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -96,7 +96,7 @@ def handle_check_mk_check_result(check_plugin_name, description): infotexts.append("%s" % e) status = max(status, exit_spec.get("exception", 3)) - except Exception, e: + except Exception: if cmk.debug.enabled(): raise crash_output = cmk_base.crash_reporting.create_crash_dump(hostname, check_plugin_name, None, diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index fcaf2a9..1c6ae4f 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -652,10 +652,11 @@ def _discover_services(hostname, ipaddress, sources, multi_host_sections, on_err discovered_services.append((check_plugin_name, item, paramstring)) except (KeyboardInterrupt, MKTimeout): raise - except Exception, e: - if cmk.debug.enabled(): + except Exception: + if on_error == "raise": raise - raise MKGeneralException("Exception in check plugin '%s': %s" % (check_plugin_name, e)) + elif on_error == "warn": + console.error("Discovery of '%s' failed: %s\n" % (check_plugin_nam, e)) return discovered_services

6 years, 5 months

Nagios: Add discovery service in same situation as with Microcore

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a78cace86959f088d13e1a347a7fe61744601ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a78cace86959f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 17:51:32 2018 +0200 Nagios: Add discovery service in same situation as with Microcore Change-Id: I9fc618cc0d1fb0f35ab7c1bbdb49fda2b53386cb --- cmk_base/core_nagios.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index ecaa1e2..62ebc25 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -531,7 +531,7 @@ define service { # Inventory checks - if user has configured them. if params["check_interval"] \ and not config.service_ignored(hostname, None, service_discovery_name) \ - and not "ping" in config.tags_of_host(hostname): # FIXME/TODO: Why not user is_ping_host()? + and not config.is_ping_host(hostname): outfile.write(""" define service { use\t\t\t\t%s

6 years, 5 months

6042 FIX Nagios: Fix processing of service output containing special characters

by Lars Michelsen

Module: check_mk Branch: master Commit: ace9fb27fe6dc5e988aafff76802f973f0706ee5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ace9fb27fe6dc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 17:53:02 2018 +0200 6042 FIX Nagios: Fix processing of service output containing special characters When using nagios service results of the "Check_MK *" services could end up with output of "(null)" when the resulting text contained special characters. Change-Id: Ie0e62ca4a288dde140d2e873dc8785ad9ed46fd0 --- .werks/6042 | 12 ++++++++++++ cmk_base/checking.py | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/6042 b/.werks/6042 new file mode 100644 index 0000000..79f07b3 --- /dev/null +++ b/.werks/6042 @@ -0,0 +1,12 @@ +Title: Nagios: Fix processing of service output containing special characters +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524844305 + +When using nagios service results of the "Check_MK *" services could end up +with output of "(null)" when the resulting text contained special characters. diff --git a/cmk_base/checking.py b/cmk_base/checking.py index c338d1a..9982ee7 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -109,14 +109,14 @@ def handle_check_mk_check_result(check_plugin_name, description): if perfdata: output_txt += " | %s" % " ".join(perfdata) if long_infotexts: - output_txt += "\n" + "\n".join(long_infotexts) + output_txt = "%s\n%s" % (output_txt, "\n".join(long_infotexts)) output_txt += "\n" if _in_keepalive_mode(): keepalive.add_keepalive_active_check_result(hostname, output_txt) - console.verbose(output_txt) + console.verbose(output_txt.encode("utf-8")) else: - console.output(output_txt) + console.output(output_txt.encode("utf-8")) return status return wrapped_check_func

6 years, 5 months

Fixed typo

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e26560b3edaa6a148619a550e71f1b4eb341a54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e26560b3edaa6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 17:54:03 2018 +0200 Fixed typo Change-Id: Id48a14c0bd2b4c01aa8df169ed065c82dc78222f --- cmk_base/discovery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 1c6ae4f..da640f3 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -652,11 +652,11 @@ def _discover_services(hostname, ipaddress, sources, multi_host_sections, on_err discovered_services.append((check_plugin_name, item, paramstring)) except (KeyboardInterrupt, MKTimeout): raise - except Exception: + except Exception, e: if on_error == "raise": raise elif on_error == "warn": - console.error("Discovery of '%s' failed: %s\n" % (check_plugin_nam, e)) + console.error("Discovery of '%s' failed: %s\n" % (check_plugin_name, e)) return discovered_services

6 years, 5 months

6039 FIX Nagios: Fixed monitoring of cluster hosts and nodes

by Lars Michelsen

Module: check_mk Branch: master Commit: bd125da12fd5d9bdb357d649d2b184978a09e0e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd125da12fd5d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 14:18:21 2018 +0200 6039 FIX Nagios: Fixed monitoring of cluster hosts and nodes Monitoring Check_MK clusters was not correctly working in all previous 1.5 releases. Change-Id: Ia38df05938d5ff31c5318f5ef8b8453744fe6c8b --- .werks/6039 | 12 ++++++++++++ cmk_base/core_nagios.py | 32 +++++++++++++++++--------------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/.werks/6039 b/.werks/6039 new file mode 100644 index 0000000..b0006df --- /dev/null +++ b/.werks/6039 @@ -0,0 +1,12 @@ +Title: Nagios: Fixed monitoring of cluster hosts and nodes +Level: 2 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524831426 + +Monitoring Check_MK clusters was not correctly working in all +previous 1.5 releases. diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 3a9b14a..ecaa1e2 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -951,8 +951,8 @@ def _precompile_hostcheck(hostname): pass # check table, enriched with addition precompiled information. - check_table = check_table.get_precompiled_check_table(hostname) - if not check_table: + host_check_table = check_table.get_precompiled_check_table(hostname, filter_mode="include_clustered") + if not host_check_table: console.verbose("(no Check_MK checks)\n") return @@ -1013,23 +1013,27 @@ if '-d' in sys.argv: # has at least one SNMP based check. Also collect the needed check # types and sections. needed_check_plugin_names = set([]) - needed_sections = set([]) - for check_plugin_name, _unused_item, _unused_param, descr in check_table: + for check_plugin_name, _unused_item, _unused_param, descr in host_check_table: if check_plugin_name not in checks.check_info: sys.stderr.write('Warning: Ignoring missing check %s.\n' % check_plugin_name) continue + if checks.check_info[check_plugin_name].get("extra_sections"): for section_name in checks.check_info[check_plugin_name]["extra_sections"]: if section_name in checks.check_info: needed_check_plugin_names.add(section_name) - needed_sections.add(section_name) - needed_sections.add(checks.section_name_of(check_plugin_name)) needed_check_plugin_names.add(check_plugin_name) + # Also include the check plugins of the cluster nodes to be able to load + # the autochecks of the nodes + if config.is_cluster(hostname): + for node in config.nodes_of(hostname): + needed_check_plugin_names.update([ e[0] for e in check_table.get_precompiled_check_table(node) ]) + # check info table # We need to include all those plugins that are referenced in the host's - # check table + # check table. filenames = [] for check_plugin_name in needed_check_plugin_names: section_name = checks.section_name_of(check_plugin_name) @@ -1054,25 +1058,23 @@ if '-d' in sys.argv: filenames.append(path) output.write("checks.load_checks(%r)\n" % filenames) - for filename in filenames: - console.verbose(" %s%s%s", tty.green, filename.split('/')[-1], tty.normal, stream=sys.stderr) + for check_plugin_name in sorted(needed_check_plugin_names): + console.verbose(" %s%s%s", tty.green, check_plugin_name, tty.normal, stream=sys.stderr) output.write("config.load(validate_hosts=False)\n") # handling of clusters if config.is_cluster(hostname): cluster_nodes = config.nodes_of(hostname) - output.write("clusters = { %r : %r }\n" % - (hostname, cluster_nodes)) - output.write("def is_cluster(hostname):\n return hostname == %r\n\n" % hostname) + output.write("config.is_cluster = lambda h: h == %r\n" % hostname) nodes_of_map = {hostname: cluster_nodes} for node in config.nodes_of(hostname): nodes_of_map[node] = None - output.write("def nodes_of(hostname):\n return %r[hostname]\n\n" % nodes_of_map) + output.write("config.nodes_of = lambda h: %r[h]\n" % nodes_of_map) else: - output.write("clusters = {}\ndef is_cluster(hostname):\n return False\n\n") - output.write("def nodes_of(hostname):\n return None\n") + output.write("config.is_cluster = lambda h: False\n") + output.write("config.nodes_of = lambda h: None\n") # IP addresses needed_ipaddresses, needed_ipv6addresses, = {}, {}

6 years, 5 months

6040 FIX if: Fixed interface graphs for some hosts when using the raw edition

by Lars Michelsen

Module: check_mk Branch: master Commit: 916554c8ec357763fb84fed95ebc265acb5d8c72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=916554c8ec3577… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 14:38:45 2018 +0200 6040 FIX if: Fixed interface graphs for some hosts when using the raw edition Some network interface graphs were not working as expected. Instead an "Error 500" was shown in the GUI hover menus. When clicking on the graph icon, PNP showed some kind of PHP error message about a non numeric value. Change-Id: I5b79bc76843da1b2d404053ee0b10b3ecc817cd8 --- .werks/6040 | 13 +++ pnp-templates/check_mk-if.php | 226 ------------------------------------------ 2 files changed, 13 insertions(+), 226 deletions(-) diff --git a/.werks/6040 b/.werks/6040 new file mode 100644 index 0000000..f0404bd --- /dev/null +++ b/.werks/6040 @@ -0,0 +1,13 @@ +Title: if: Fixed interface graphs for some hosts when using the raw edition +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524832612 + +Some network interface graphs were not working as expected. Instead an "Error +500" was shown in the GUI hover menus. When clicking on the graph icon, PNP +showed some kind of PHP error message about a non numeric value. diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php deleted file mode 100644 index d836384..0000000 --- a/pnp-templates/check_mk-if.php +++ /dev/null @@ -1,226 +0,0 @@ -<?php -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# tails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - -setlocale(LC_ALL, 'C'); - -# Performance data from check: -# in=6864.39071505;0.01;0.1;0;125000000.0 -# inucast=48.496962273;0.01;0.1;; -# innucast=4.60122981717;0.01;0.1;; -# indisc=0.0;0.01;0.1;; -# inerr=0.0;0.01;0.1;; -# out=12448.259172;0.01;0.1;0;125000000.0 -# outucast=54.9846963152;0.01;0.1;; -# outnucast=10.5828285795;0.01;0.1;; -# outdisc=0.0;0.01;0.1;; -# outerr=0.0;0.01;0.1;; -# outqlen=0;;;;10000000 - -# Graph 1: used bandwidth - -# Determine if Bit or Byte. Bit is signalled via a min value of 0.0 -# in the 11th performance value. -if (!strcmp($MIN[11], "0.0")) { - $unit = "Bit"; - $unit_multiplier = 8; - $base = 1000; // Megabit is 1000 * 1000 -} -else { - $unit = "B"; - $unit_multiplier = 1; - $base = 1000; // Megabyte is 1000 * 1000 -} - -# Convert bytes to bits if neccessary -$bandwidth = $MAX[1] * $unit_multiplier; -$warn = $WARN[1] * $unit_multiplier; -$crit = $CRIT[1] * $unit_multiplier; - -# Now choose a convenient scale, based on the known bandwith of -# the interface, and break down bandwidth, warn and crit by that -# scale. -$bwuom = ' '; -if ($bandwidth > $base * $base * $base) { - $scale = $base * $base * $base; - $bwuom = 'G'; -} -elseif ($bandwidth > $base * $base) { - $scale = $base * $base; - $bwuom = 'M'; -} -elseif ($bandwidth > $base) { - $scale = $base; - $bwuom = 'k'; -} -else { - $scale = 1; - $bwuom = ' '; -} - -$warn /= $scale; -$crit /= $scale; -$bandwidth /= $scale; - -$vertical_label_name = $bwuom . $unit . "/sec"; - -$range = min(10, $bandwidth); - - -$bandwidthInfo = ""; -if ($bandwidth > 0){ - $bandwidthInfo = " at " . sprintf("%.1f", $bandwidth) . " ${bwuom}${unit}/s"; -} -$ds_name[1] = 'Used bandwidth'; -$opt[1] = "--vertical-label \"$vertical_label_name\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc$bandwidthInfo\" "; -$def[1] = - "HRULE:0#c0c0c0 "; -if ($bandwidth) - $def[1] .= "HRULE:$bandwidth#808080:\"Port speed\: " . sprintf("%10.1f", $bandwidth) . " ".$bwuom."$unit/s\\n\" ". - "HRULE:-$bandwidth#808080: "; -if ($warn) - $def[1] .= "HRULE:$warn#ffff00:\"Warning\: " . sprintf("%13.1f", $warn) . " ".$bwuom."$unit/s\\n\" ". - "HRULE:-$warn#ffff00: "; -if ($crit) - $def[1] .= "HRULE:$crit#ff0000:\"Critical\: " . sprintf("%13.1f", $crit) . " ".$bwuom."$unit/s\\n\" ". - "HRULE:-$crit#ff0000: "; - - $def[1] .= "". - # incoming - "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". - "CDEF:intraffic=inbytes,$unit_multiplier,* ". - "CDEF:inmb=intraffic,$scale,/ ". - "AREA:inmb#00e060:\"in \" ". - "GPRINT:intraffic:LAST:\"%7.1lf %s$unit/s last\" ". - "GPRINT:intraffic:AVERAGE:\"%7.1lf %s$unit/s avg\" ". - "GPRINT:intraffic:MAX:\"%7.1lf %s$unit/s max\\n\" ". - "VDEF:inperc=intraffic,95,PERCENTNAN ". - "VDEF:inpercmb=inmb,95,PERCENTNAN ". - "LINE:inpercmb#008f00:\"95% percentile\" ". - "GPRINT:inperc:\"%7.1lf %s$unit/s\\n\" ". - - # outgoing - "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". - "CDEF:outtraffic=outbytes,$unit_multiplier,* ". - "CDEF:minusouttraffic=outtraffic,-1,* ". - "CDEF:outmb=outtraffic,$scale,/ ". - "CDEF:minusoutmb=0,outmb,- ". - "AREA:minusoutmb#0080e0:\"out \" ". - "GPRINT:outtraffic:LAST:\"%7.1lf %s$unit/s last\" ". - "GPRINT:outtraffic:AVERAGE:\"%7.1lf %s$unit/s avg\" ". - "GPRINT:outtraffic:MAX:\"%7.1lf %s$unit/s max\\n\" ". - "VDEF:outperc=minusouttraffic,5,PERCENTNAN ". - "VDEF:outpercmb=minusoutmb,5,PERCENTNAN ". - "LINE:outpercmb#00008f:\"95% percentile\" ". - "GPRINT:outperc:\"%7.1lf %s$unit/s\\n\" ". - - ""; - -if (isset($DS[12])) { - $def[1] .= - "DEF:inbytesa=$RRDFILE[12]:$DS[12]:MAX ". - "DEF:outbytesa=$RRDFILE[13]:$DS[13]:MAX ". - "CDEF:intraffica=inbytesa,$unit_multiplier,* ". - "CDEF:outtraffica=outbytesa,$unit_multiplier,* ". - "CDEF:inmba=intraffica,$scale,/ ". - "CDEF:outmba=outtraffica,$scale,/ ". - "CDEF:minusoutmba=0,outmba,- ". - "LINE:inmba#00a060:\"in (avg) \" ". - "GPRINT:intraffica:LAST:\"%6.1lf %s$unit/s last\" ". - "GPRINT:intraffica:AVERAGE:\"%6.1lf %s$unit/s avg\" ". - "GPRINT:intraffica:MAX:\"%6.1lf %s$unit/s max\\n\" ". - "LINE:minusoutmba#0060c0:\"out (avg) \" ". - "GPRINT:outtraffica:LAST:\"%6.1lf %s$unit/s last\" ". - "GPRINT:outtraffica:AVERAGE:\"%6.1lf %s$unit/s avg\" ". - "GPRINT:outtraffica:MAX:\"%6.1lf %s$unit/s max\\n\" "; -} - -# Graph 2: packets -$ds_name[2] = 'Packets'; -$opt[2] = "--vertical-label \"packets/sec\" --title \"Packets $hostname / $servicedesc\" "; -$def[2] = - # ingoing - "HRULE:0#c0c0c0 ". - "DEF:inu=$RRDFILE[2]:$DS[2]:MAX ". - "DEF:innu=$RRDFILE[3]:$DS[3]:MAX ". - "CDEF:in=inu,innu,+ ". - "AREA:inu#00ffc0:\"in unicast \" ". - "GPRINT:inu:LAST:\"%9.1lf/s last \" ". - "GPRINT:inu:AVERAGE:\"%9.1lf/s avg \" ". - "GPRINT:inu:MAX:\"%9.1lf/s max\\n\" ". - "AREA:innu#00c080:\"in broadcast/multicast \":STACK ". - "GPRINT:innu:LAST:\"%9.1lf/s last \" ". - "GPRINT:innu:AVERAGE:\"%9.1lf/s avg \" ". - "GPRINT:innu:MAX:\"%9.1lf/s max\\n\" ". - "VDEF:inperc=in,95,PERCENTNAN ". - "LINE:inperc#00cf00:\"in 95% percentile \" ". - "GPRINT:inperc:\"%9.1lf/s\\n\" ". - - # outgoing - "DEF:outu=$RRDFILE[7]:$DS[7]:MAX ". - "DEF:outnu=$RRDFILE[8]:$DS[8]:MAX ". - "CDEF:minusoutu=0,outu,- ". - "CDEF:minusoutnu=0,outnu,- ". - "CDEF:minusout=minusoutu,minusoutnu,+ ". - "AREA:minusoutu#00c0ff:\"out unicast \" ". - "GPRINT:outu:LAST:\"%9.1lf/s last \" ". - "GPRINT:outu:AVERAGE:\"%9.1lf/s avg \" ". - "GPRINT:outu:MAX:\"%9.1lf/s max\\n\" ". - "AREA:minusoutnu#0080c0:\"out broadcast/multicast\":STACK ". - "GPRINT:outnu:LAST:\"%9.1lf/s last \" ". - "GPRINT:outnu:AVERAGE:\"%9.1lf/s avg \" ". - "GPRINT:outnu:MAX:\"%9.1lf/s max\\n\" ". - "VDEF:outperc=minusout,5,PERCENTNAN ". - "LINE:outperc#0000cf:\"out 95% percentile \" ". - "GPRINT:outperc:\"%9.1lf/s\\n\" ". - ""; - -# Graph 3: errors and discards -$ds_name[3] = 'Errors and discards'; -$opt[3] = "--vertical-label \"packets/sec\" -X0 --title \"Problems $hostname / $servicedesc\" "; -$def[3] = - "HRULE:0#c0c0c0 ". - "DEF:inerr=$RRDFILE[5]:$DS[5]:MAX ". - "DEF:indisc=$RRDFILE[4]:$DS[4]:MAX ". - "AREA:inerr#ff0000:\"in errors \" ". - "GPRINT:inerr:LAST:\"%7.2lf/s last \" ". - "GPRINT:inerr:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:inerr:MAX:\"%7.2lf/s max\\n\" ". - "AREA:indisc#ff8000:\"in discards \":STACK ". - "GPRINT:indisc:LAST:\"%7.2lf/s last \" ". - "GPRINT:indisc:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:indisc:MAX:\"%7.2lf/s max\\n\" ". - "DEF:outerr=$RRDFILE[10]:$DS[10]:MAX ". - "DEF:outdisc=$RRDFILE[9]:$DS[9]:MAX ". - "CDEF:minusouterr=0,outerr,- ". - "CDEF:minusoutdisc=0,outdisc,- ". - "AREA:minusouterr#ff0080:\"out errors \" ". - "GPRINT:outerr:LAST:\"%7.2lf/s last \" ". - "GPRINT:outerr:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:outerr:MAX:\"%7.2lf/s max\\n\" ". - "AREA:minusoutdisc#ff8080:\"out discards \":STACK ". - "GPRINT:outdisc:LAST:\"%7.2lf/s last \" ". - "GPRINT:outdisc:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:outdisc:MAX:\"%7.2lf/s max\\n\" "; -?>

6 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018