Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

Add integration test based regression test for CMK-1381

by Lars Michelsen

Module: check_mk Branch: master Commit: 1938e207d9b598b8188bfd119ba08f27628debf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1938e207d9b598… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 29 13:24:05 2018 +0100 Add integration test based regression test for CMK-1381 Change-Id: Ia7b3b9e2148f94a06db3b76856389b63a1d4b9fe --- tests/integration/livestatus/test_livestatus.py | 64 ++++++++++++++++++++----- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/tests/integration/livestatus/test_livestatus.py b/tests/integration/livestatus/test_livestatus.py index 5526cb7..187532e 100644 --- a/tests/integration/livestatus/test_livestatus.py +++ b/tests/integration/livestatus/test_livestatus.py @@ -2,14 +2,22 @@ # encoding: utf-8 import pytest +import itertools + from testlib import web + @pytest.fixture(scope="module") def default_cfg(web): print "Applying default config" - web.add_host("livestatus-test-host", attributes={ - "ipaddress": "127.0.0.1", - }) + web.add_host( + "livestatus-test-host", attributes={ + "ipaddress": "127.0.0.1", + }) + web.add_host( + "livestatus-test-host.domain", attributes={ + "ipaddress": "127.0.0.1", + }) web.discover_services("livestatus-test-host") @@ -22,11 +30,12 @@ def default_cfg(web): print "Cleaning up default config" web.delete_host("livestatus-test-host") + web.delete_host("livestatus-test-host.domain") # Simply detects all tables by querying the columns table and then # queries each of those tables without any columns and filters -(a)pytest.mark.parametrize(("core"), [ "nagios", "cmc" ]) +(a)pytest.mark.parametrize(("core"), ["nagios", "cmc"]) def test_tables(default_cfg, site, core): site.set_config("CORE", core, with_restart=True) @@ -39,31 +48,60 @@ def test_tables(default_cfg, site, core): for table in existing_tables: if core == "nagios" and table == "statehist": - continue # the statehist table in nagios can not be fetched without time filter + continue # the statehist table in nagios can not be fetched without time filter result = site.live.query("GET %s\n" % table) - assert type(result) == list + assert isinstance(result, list) -(a)pytest.mark.parametrize(("core"), [ "nagios", "cmc" ]) +(a)pytest.mark.parametrize(("core"), ["nagios", "cmc"]) def test_host_table(default_cfg, site, core): site.set_config("CORE", core, with_restart=True) rows = site.live.query("GET hosts") - assert type(rows) == list - assert len(rows) >= 2 # header + min 1 host + assert isinstance(rows, list) + assert len(rows) >= 2 # header + min 1 host + + +(a)pytest.mark.parametrize("core,query_and_result", + itertools.product([ + "nagios", + "cmc", + ], [ + { + "query": ("GET hosts\n" + "Columns: host_name\n" + "Filter: host_name = livestatus-test-host.domain\n"), + "result": [{ + u'name': u'livestatus-test-host.domain', + },], + }, + { + "query": ("GET hosts\n" + "Columns: host_name\n" + "Filter: host_name = livestatus-test-host\n"), + "result": [{ + u'name': u'livestatus-test-host', + },], + }, + ])) +def test_host_table_host_equal_filter(default_cfg, site, core, query_and_result): + site.set_config("CORE", core, with_restart=True) + + rows = site.live.query_table_assoc(query_and_result["query"]) + assert rows == query_and_result["result"] -(a)pytest.mark.parametrize(("core"), [ "nagios", "cmc" ]) +(a)pytest.mark.parametrize(("core"), ["nagios", "cmc"]) def test_service_table(default_cfg, site, core): site.set_config("CORE", core, with_restart=True) rows = site.live.query("GET services\nFilter: host_name = livestatus-test-host\n" "Columns: description\n") - assert type(rows) == list - assert len(rows) >= 20 # header + min 1 service + assert isinstance(rows, list) + assert len(rows) >= 20 # header + min 1 service - descriptions = [ r[0] for r in rows ] + descriptions = [r[0] for r in rows] assert "Check_MK" in descriptions assert "Check_MK Discovery" in descriptions

5 years, 10 months

6916 FIX Fixed display of incorrectly quoted commands in classic SNMP verbose output

by Lars Michelsen

Module: check_mk Branch: master Commit: 24c2d97fa1f2f47d282e01892e1d939b490e1b3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24c2d97fa1f2f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 30 08:26:01 2018 +0100 6916 FIX Fixed display of incorrectly quoted commands in classic SNMP verbose output The executed commands, e.g. when doing SNMP walks or get commands were quoted correctly. Only the output on the console was writing out incorrectly quoted arguments. CMK-1351 Change-Id: I51cc9d8d4d6ad0249b0e19aed1961cedb7885eb3 --- .werks/6916 | 14 ++++++++++++++ cmk_base/classic_snmp.py | 6 ++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/6916 b/.werks/6916 new file mode 100644 index 0000000..67d5f57 --- /dev/null +++ b/.werks/6916 @@ -0,0 +1,14 @@ +Title: Fixed display of incorrectly quoted commands in classic SNMP verbose output +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1543496404 + +The executed commands, e.g. when doing SNMP walks or get commands were quoted correctly. +Only the output on the console was writing out incorrectly quoted arguments. + +CMK-1351 diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index 7caed13..d39176c 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -63,8 +63,7 @@ def walk(access_data, oid, hex_plain=False, context_name=None): command = _snmp_walk_command(access_data, context_name) command += ["-OQ", "-OU", "-On", "-Ot", "%s%s%s" % (protospec, ipaddress, portspec), oid] - debug_cmd = ["''" if a == "" else a for a in command] - console.vverbose("Running '%s'\n" % " ".join(debug_cmd)) + console.vverbose("Running '%s'\n" % subprocess.list2cmdline(command)) snmp_process = None exitstatus = None @@ -158,8 +157,7 @@ def get(access_data, oid, context_name=None): "%s%s%s" % (protospec, ipaddress, portspec), oid_prefix ] - debug_cmd = ["''" if a == "" else a for a in command] - console.vverbose("Running '%s'\n" % " ".join(debug_cmd)) + console.vverbose("Running '%s'\n" % subprocess.list2cmdline(command)) snmp_process = subprocess.Popen( command, close_fds=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

5 years, 10 months

added WK6692: Liveproxy Daemon: Unreachable remote sites still caused a connection timeout

by Andreas Boesl

Module: check_mk Branch: master Commit: d087a2e79028b0dd7bda5186113c628d197b51a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d087a2e79028b0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 29 15:56:25 2018 +0100 added WK6692: Liveproxy Daemon: Unreachable remote sites still caused a connection timeout Change-Id: I763b6e956c884e287554af6c622da8f8eb20beb7 --- .werks/6692 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/6692 b/.werks/6692 new file mode 100644 index 0000000..b63183f --- /dev/null +++ b/.werks/6692 @@ -0,0 +1,14 @@ +Title: Liveproxy Daemon: Unreachable remote sites still caused a connection timeout +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1543490589 + +One job of the liveproxyd is to decrease the response timeout for dead sites. +This feature did not work as expected. A client trying to connect to a dead slave site +always had at least a <tt>Timeout waiting for free channel</tt> timeout. +

5 years, 10 months

HW/SW Inventory history: Fixed delta tree computation

by Simon Betz

Module: check_mk Branch: master Commit: c7181c3d9798cbff222475bff4563bcd9d2c4c13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7181c3d9798cb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 29 14:59:07 2018 +0100 HW/SW Inventory history: Fixed delta tree computation Change-Id: I587a88db1c07d27ac10bf7ffe1ef89c0b5ce80eb --- .werks/6815 | 46 ++++ cmk/structured_data.py | 233 ++++++++++----------- .../cmk/structured_data/test_structured_data.py | 66 ++++++ 3 files changed, 219 insertions(+), 126 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c7181c3d97…

5 years, 10 months

6915 FIX IPMI Management board: Fixed random "Session no longer connected" message

by Lars Michelsen

Module: check_mk Branch: master Commit: 0833e7b1ff744c54ceac02595002d1dca5b5e1ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0833e7b1ff744c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 27 12:35:23 2018 +0100 6915 FIX IPMI Management board: Fixed random "Session no longer connected" message The Check_MK service of hosts that have a IPMI based management board configured could randomly result in an UNKNOWN state with the error message "Session no longer connected". This was a result of unstable connections to the IPMI boards which should now be handled in a more stable way. CMK-1366 Change-Id: I5a9ee67bbaf305295ae68786dccd3ae9fd0bcf86 --- .werks/6915 | 15 +++++++++++++++ cmk_base/data_sources/ipmi.py | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/.werks/6915 b/.werks/6915 new file mode 100644 index 0000000..9bf9b9c --- /dev/null +++ b/.werks/6915 @@ -0,0 +1,15 @@ +Title: IPMI Management board: Fixed random "Session no longer connected" message +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1543317790 + +The Check_MK service of hosts that have a IPMI based management board configured could +randomly result in an UNKNOWN state with the error message "Session no longer connected". + +This was a result of unstable connections to the IPMI boards which should now be handled +in a more stable way. diff --git a/cmk_base/data_sources/ipmi.py b/cmk_base/data_sources/ipmi.py index 157e448..74a1701 100644 --- a/cmk_base/data_sources/ipmi.py +++ b/cmk_base/data_sources/ipmi.py @@ -89,6 +89,7 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS return ["mgmt_ipmi_sensors"] def _execute(self): + connection = None try: connection = self._create_ipmi_connection() @@ -106,6 +107,9 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS raise MKAgentError("IPMI communication failed: %r" % e) else: raise + finally: + if connection: + connection.ipmi_session.logout() def _create_ipmi_connection(self): # Do not use the (custom) ipaddress for the host. Use the management board

5 years, 10 months

Adding delta nodes: Fixed wrong argument order

by Simon Betz

Module: check_mk Branch: master Commit: c4d2dd782880f22e6f30d721ceb6e369eb222e53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4d2dd782880f2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 29 13:02:53 2018 +0100 Adding delta nodes: Fixed wrong argument order Change-Id: I00b6fb088275dc2e8f54b1ae5d4f6ccc9ee3c473 --- cmk/structured_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/structured_data.py b/cmk/structured_data.py index 067cbe7..a9ade9d 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -386,8 +386,8 @@ class Container(NodeAttribute): if my_child.is_equal(old_child): if keep_identical: delta_node.add_child( - edge, abs_path, - my_child.encode_for_delta_tree(encode_as=_identical_delta_tree_node)) + edge, my_child.encode_for_delta_tree(encode_as=_identical_delta_tree_node), + abs_path) continue new_entries, changed_entries, removed_entries, delta_child = \ my_child.compare_with(old_child, keep_identical=keep_identical)

5 years, 10 months

Make loading/filtering persisted sections race condition free

by Simon Betz

Module: check_mk Branch: master Commit: 1a1984ef27dd019e464c547b0c4257db844160eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a1984ef27dd01… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 29 12:44:07 2018 +0100 Make loading/filtering persisted sections race condition free Change-Id: Iecce769aac82f1455f97c9b24fef533b871cc5c5 --- cmk_base/data_sources/abstract.py | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index ff61691..d181e69 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -430,7 +430,7 @@ class DataSource(object): if not persisted_sections: return host_sections - for section_name, entry in persisted_sections.items(): + for section_name, entry in persisted_sections.iteritems(): if len(entry) == 2: continue # Skip entries of "old" format @@ -450,44 +450,35 @@ class DataSource(object): file_path = self._persisted_sections_file_path() persisted_sections = store.load_data_from_file(file_path, {}) - persisted_sections = self._filter_outdated_persisted_sections(persisted_sections) + filtered_persisted_sections = self._filter_outdated_persisted_sections(persisted_sections) - if not persisted_sections: + if not filtered_persisted_sections: self._logger.debug("No persisted sections loaded") - else: - self._logger.debug( - "Loaded persisted sections: %s" % (", ".join(persisted_sections.keys()))) + try: + os.remove(self._persisted_sections_file_path()) + except OSError: + pass - return persisted_sections + return filtered_persisted_sections # TODO: This is not race condition free when modifying the data. Either remove # the possible write here and simply ignore the outdated sections or lock when # reading and unlock after writing def _filter_outdated_persisted_sections(self, persisted_sections): + filtered_persisted_sections = {} now = time.time() - modified = False - for section_name, entry in persisted_sections.items(): + for section_name, entry in persisted_sections.iteritems(): if len(entry) == 2: persisted_until = entry[0] else: persisted_until = entry[1] if not self._use_outdated_persisted_sections and now > persisted_until: - self._logger.debug("Persisted section %s is outdated by %d seconds. Deleting it." % + self._logger.debug("Persisted section %s is outdated by %d seconds. Skipping it." % (section_name, now - persisted_until)) - del persisted_sections[section_name] - modified = True - - if not persisted_sections: - try: - os.remove(self._persisted_sections_file_path()) - except OSError: - pass - - elif modified: - self._store_persisted_sections(persisted_sections) - - return persisted_sections + continue + filtered_persisted_sections[section_name] = entry + return filtered_persisted_sections @classmethod def use_outdated_persisted_sections(cls):

5 years, 10 months

Structured data: Renamed some variables for better readability and improved delta tree encoding

by Simon Betz

Module: check_mk Branch: master Commit: d629266aad55c99fd6dc5f7c32262cd0c7112138 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d629266aad55c9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 29 12:50:03 2018 +0100 Structured data: Renamed some variables for better readability and improved delta tree encoding Change-Id: I4d2081640ca1cf00bd0e8731df743452ce9b5d29 --- cmk/structured_data.py | 243 +++++++++++++++++++++++++++---------------------- 1 file changed, 136 insertions(+), 107 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d629266aad…

5 years, 10 months

agent_azure_args: return list and satisfy pylint

by Moritz Kiemer

Module: check_mk Branch: master Commit: 965113bcf8432cfcfca7932fceec63200c4fceb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=965113bcf8432c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Nov 28 08:39:04 2018 +0100 agent_azure_args: return list and satisfy pylint CMK-1244 Change-Id: I5592492913b20db44640fb17bd5e8a4fbbd0aef0 --- checks/agent_azure_args | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/checks/agent_azure_args b/checks/agent_azure_args index ca884db..6d16785 100644 --- a/checks/agent_azure_args +++ b/checks/agent_azure_args @@ -31,12 +31,12 @@ def agent_azure_arguments(params, _no_hostname, _no_ipaddress): args = [] opts = (i for i in params.iteritems() if i[0].startswith("--")) - for k, v in opts: - if isinstance(v, bool): - if v: - args.append(k) + for key, value in opts: + if isinstance(value, bool): + if value: + args.append(key) else: - args += [k, quote_shell_string(v)] + args += [key, quote_shell_string(value)] config = params['config'] if "fetchall" in config: @@ -45,24 +45,24 @@ def agent_azure_arguments(params, _no_hostname, _no_ipaddress): explicit = config.get('explicit-config', []) if explicit: args.append("--explicit-config") - for d in explicit: - g_name = d['group_name'] + for group_dict in explicit: + g_name = group_dict['group_name'] args.append(quote_shell_string("group=%s" % g_name)) - g_conf = d['group_config'] - if g_conf == 'fetchall': + group_cfg = group_dict['group_config'] + if group_cfg == 'fetchall': continue - for r_cfg in g_conf: + for resource_cfg in group_cfg: for key in ('resource', 'metric', 'filters', 'time_grain'): - value = r_cfg.get(key) + value = resource_cfg.get(key) if not value: break if isinstance(value, list): value = ','.join(value) args.append(quote_shell_string("%s=%s" % (key, value))) - return ' '.join(args) + return args special_agent_info['azure'] = agent_azure_arguments

5 years, 10 months

6897 juniper_gbp_state: Add IPv6 support

by Florian Kromer

Module: check_mk Branch: master Commit: 799a8d86e6c879311907fbadfb4a791549e676f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=799a8d86e6c879… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Nov 27 11:26:05 2018 +0100 6897 juniper_gbp_state: Add IPv6 support Previously the juniper_bgp_state check supported IPv4 addresses only. This werk adds support for IPv6 addresses. CMK-1334 Change-Id: I3937036f96b078044871255d671ee83784485e8c --- .werks/6897 | 13 +++++++++++++ checks/juniper_bgp_state | 11 ++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.werks/6897 b/.werks/6897 new file mode 100644 index 0000000..7a40ee5 --- /dev/null +++ b/.werks/6897 @@ -0,0 +1,13 @@ +Title: juniper_gbp_state: Add IPv6 support +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1543314263 +Class: feature + +Previously the juniper_bgp_state check supported IPv4 addresses only. +This werk adds support for IPv6 addresses. + +CMK-1334 diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state index ba1d3cb..3c55e68 100644 --- a/checks/juniper_bgp_state +++ b/checks/juniper_bgp_state @@ -26,7 +26,16 @@ def juniper_bgp_state_create_item(oid_end): - return re.sub(r"[0-9]+\.1\.[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\.1\.", "", oid_end) + # supports IPv4 (e.g. 255.255.255.255) and + # IPv6 (e.g. 1762:0:0:0:0:B03:1:AF18) + ipv4_regex = r"[0-9]+\.1\.[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\.1\." + ipv6_regex = r"^(?:[A-F0-9]{1,4}:){7}[A-F0-9]{1,4}$" + ipv4_match = re.match(ipv4_regex, oid_end) + if ipv4_match: + return ipv4_match.group() + ipv6_match = re.match(ipv6_regex, oid_end) + if ipv6_match: + return ipv6_match.group() def inventory_juniper_bgp_state(info):

5 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018