Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Cleaned up side effects of other cmk_base tests with the new management board tests

by Lars Michelsen

Module: check_mk Branch: master Commit: f1ca63fb77fb0badd73f61bd67d4ff4161a2dc6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1ca63fb77fb0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 14:04:11 2018 +0100 Cleaned up side effects of other cmk_base tests with the new management board tests Change-Id: I5957b5a934a42266816bc4e1e170dc3e16d73e0a --- tests/cmk_base/test_data_sources.py | 2 +- tests/cmk_base/test_mgmt_board.py | 56 ++++++++++++++++++++++++++----------- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/tests/cmk_base/test_data_sources.py b/tests/cmk_base/test_data_sources.py index cba1986..ea9afb7 100644 --- a/tests/cmk_base/test_data_sources.py +++ b/tests/cmk_base/test_data_sources.py @@ -52,9 +52,9 @@ def test_cfg(web, site): import cmk.debug cmk.debug.enable() + # Needs to be done together, even when the checks are not directly needed import cmk_base.checks as checks checks.load() - config.load() yield None diff --git a/tests/cmk_base/test_mgmt_board.py b/tests/cmk_base/test_mgmt_board.py index 3d55a1d..3718839 100644 --- a/tests/cmk_base/test_mgmt_board.py +++ b/tests/cmk_base/test_mgmt_board.py @@ -5,11 +5,33 @@ from testlib import web import cmk_base.config as config -(a)pytest.fixture(autouse=True) -def test_cfg(web): + +(a)pytest.fixture(scope="function") +def clear_config_caches(monkeypatch): + import cmk_base + import cmk_base.caching + monkeypatch.setattr(cmk_base, "config_cache", cmk_base.caching.CacheManager()) + monkeypatch.setattr(cmk_base, "runtime_cache", cmk_base.caching.CacheManager()) + + +(a)pytest.fixture(scope="function") +def reload_config(): + # Needs to be done together, even when the checks are not directly needed + import cmk_base.checks as checks + checks.load() + config.load() + + +(a)pytest.fixture(scope="function") +def enable_debug(): import cmk.debug cmk.debug.enable() + yield + cmk.debug.disable() + +(a)pytest.fixture(autouse=True) +def test_cfg(web, clear_config_caches, reload_config, enable_debug): yield # @@ -17,17 +39,19 @@ def test_cfg(web): # print "Cleaning up test config" - cmk.debug.disable() - if web.host_exists("mgmt-host"): web.delete_host("mgmt-host") if web.folder_exists("folder1"): web.delete_folder("folder1") - web.activate_changes() + web.set_ruleset("management_board_config", { + "ruleset": { + "": [], # -> folder + } + }) - config.load() + web.activate_changes() def test_mgmt_explicit_settings(web): @@ -37,7 +61,7 @@ def test_mgmt_explicit_settings(web): "management_snmp_community": "HOST", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -51,7 +75,7 @@ def test_mgmt_explicit_address(web): "management_address": "127.0.0.2", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.2" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -66,7 +90,7 @@ def test_mgmt_disabled(web): "management_snmp_community": "HOST", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") == False assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == None @@ -84,7 +108,7 @@ def test_mgmt_inherit_credentials_explicit_host(web): "management_snmp_community": "HOST", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -102,7 +126,7 @@ def test_mgmt_inherit_credentials(web): "management_protocol": "snmp", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -121,7 +145,7 @@ def test_mgmt_inherit_protocol_explicit_host(web): "management_snmp_community": "HOST", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -139,7 +163,7 @@ def test_mgmt_inherit_protocol(web): "ipaddress": "127.0.0.1", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -169,7 +193,7 @@ def test_mgmt_config_ruleset(web): "management_protocol": "snmp", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -201,7 +225,7 @@ def test_mgmt_config_ruleset_overidden_by_explicit_setting(web): "management_protocol": "snmp", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -239,7 +263,7 @@ def test_mgmt_config_ruleset_order(web): "management_protocol": "snmp", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp"

6 years, 4 months

Added typing module.

by Sven Panne

Module: check_mk Branch: master Commit: 97c70394378ff30eb5452dc95aaa347eff604164 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97c70394378ff3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 20 13:13:31 2018 +0100 Added typing module. Change-Id: Idac0d5e1dc2709f5f821b696defa49c1e19cc1df --- omd/packages/python-modules/Makefile | 9 +++++---- omd/packages/python-modules/src/typing-3.6.4.tar.gz | Bin 0 -> 71347 bytes 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 7684b8f..618a45f 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -104,13 +104,14 @@ MODULES+=requests-2.13.0.tar.gz # Has requests as dependency -> must be built after MODULES += pyOpenSSL-16.2.0.tar.gz # Added for check_bi_aggr with kerberos support -MODULES+=pykerberos-1.2.1.tar.gz -MODULES+=requests-kerberos-0.11.0.tar.gz +MODULES += pykerberos-1.2.1.tar.gz +MODULES += requests-kerberos-0.11.0.tar.gz # Added for tinkerforge special agent -MODULES+=tinkerforge-2.1.15.tar.gz +MODULES += tinkerforge-2.1.15.tar.gz # Added for check_sftp -MODULES+=paramiko-2.1.2.tar.gz +MODULES += paramiko-2.1.2.tar.gz +MODULES += typing-3.6.4.tar.gz .PHONY: build check-freetds install skel clean diff --git a/omd/packages/python-modules/src/typing-3.6.4.tar.gz b/omd/packages/python-modules/src/typing-3.6.4.tar.gz new file mode 100644 index 0000000..c345666 Binary files /dev/null and b/omd/packages/python-modules/src/typing-3.6.4.tar.gz differ

6 years, 4 months

5848 FIX Fixed broken inheritance of agent type set on folders ( regression in 1.5.0i2)

by Lars Michelsen

Module: check_mk Branch: master Commit: a68f01ec8da0e1a512531474271b7f67db78efec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a68f01ec8da0e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 14:00:27 2018 +0100 5848 FIX Fixed broken inheritance of agent type set on folders (regression in 1.5.0i2) When the "agent type" property was set on a folder, this setting was not correctly inherited to the hosts. This broke with werk #5535. Change-Id: I0054882c070d4d2758c72395338a0dc9eb6aa081 --- .werks/5848 | 11 +++++++++++ web/htdocs/watolib.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5848 b/.werks/5848 new file mode 100644 index 0000000..b4345d2 --- /dev/null +++ b/.werks/5848 @@ -0,0 +1,11 @@ +Title: Fixed broken inheritance of agent type set on folders (regression in 1.5.0i2) +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519045062 +Class: fix + +When the "agent type" property was set on a folder, this setting was not correctly +inherited to the hosts. This broke with werk #5535. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index f650544..a1ed619 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1582,7 +1582,7 @@ class CREFolder(BaseFolder): def _load(self): wato_info = self._load_wato_info() self._title = wato_info.get("title", self._fallback_title()) - self._attributes = wato_info.get("attributes", {}) + self._attributes = self._transform_old_agent_type_in_attributes(wato_info.get("attributes", {})) self._locked = wato_info.get("lock", False) self._locked_subfolders = wato_info.get("lock_subfolders", False)

6 years, 4 months

5849 FIX Fixed visibility of "Data sources" properties when editing folders

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d3fcbf710144aca4298183f8531ad76e30752b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d3fcbf710144a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 14:26:36 2018 +0100 5849 FIX Fixed visibility of "Data sources" properties when editing folders Werk #5535 introduced a new way the data sources (agent, snmp, ...) of hosts are configured. The new attributes were not editable in WATO folders at all. Change-Id: I2ebab9f534d3e20d44b994bac0a4b6a90935236d --- .werks/5849 | 11 +++++++++++ web/htdocs/wato.py | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/5849 b/.werks/5849 new file mode 100644 index 0000000..ee39c13 --- /dev/null +++ b/.werks/5849 @@ -0,0 +1,11 @@ +Title: Fixed visibility of "Data sources" properties when editing folders +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519046689 +Class: fix + +Werk #5535 introduced a new way the data sources (agent, snmp, ...) of hosts are configured. +The new attributes were not editable in WATO folders at all. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ee98de1..2d81fe9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17532,7 +17532,10 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr if depends_on_roles: dependency_mapping_roles[attrname] = depends_on_roles - if not depends_on_tags and not depends_on_roles: + if for_what not in [ "host", "cluster" ]: + topic_is_volatile = False + + elif not depends_on_tags and not depends_on_roles: # One attribute is always shown -> topic is always visible topic_is_volatile = False else:

6 years, 4 months

Add more management board tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 2486783c78cd55a516d02efa42964f09ac3f5cba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2486783c78cd55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 11:30:52 2018 +0100 Add more management board tests Change-Id: Ided35be1bc222e5078210af4f0f6ddcd7a4b3de5 --- tests/cmk_base/test_mgmt_board.py | 148 +++++++++++++++++++++++++++++--------- 1 file changed, 114 insertions(+), 34 deletions(-) diff --git a/tests/cmk_base/test_mgmt_board.py b/tests/cmk_base/test_mgmt_board.py index 06fa2a3..ee43b27 100644 --- a/tests/cmk_base/test_mgmt_board.py +++ b/tests/cmk_base/test_mgmt_board.py @@ -5,62 +5,142 @@ from testlib import web import cmk_base.config as config -(a)pytest.fixture(scope="module") -def test_cfg(web, site): - print "Applying default config" - web.add_host("mgmt-host1", attributes={ +(a)pytest.fixture(autouse=True) +def test_cfg(web): + import cmk.debug + cmk.debug.enable() + + yield + + # + # Cleanup code + # + print "Cleaning up test config" + + cmk.debug.disable() + + if web.host_exists("mgmt-host"): + web.delete_host("mgmt-host") + + if web.folder_exists("folder1"): + web.delete_folder("folder1") + + web.activate_changes() + + config.load() + + +def test_mgmt_explicit_settings(web): + web.add_host("mgmt-host", attributes={ "ipaddress": "127.0.0.1", "management_protocol": "snmp", "management_snmp_community": "HOST", }) - web.add_host("mgmt-host2", attributes={ + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "HOST" + + +def test_mgmt_explicit_address(web): + web.add_host("mgmt-host", attributes={ "ipaddress": "127.0.0.1", "management_protocol": "snmp", "management_address": "127.0.0.2", }) - web.add_host("mgmt-host3", attributes={ + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.2" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "public" + + +def test_mgmt_disabled(web): + web.add_host("mgmt-host", attributes={ "ipaddress": "127.0.0.1", "management_protocol": None, "management_address": "127.0.0.1", "management_snmp_community": "HOST", }) - web.activate_changes() + config.load() + assert config.has_management_board("mgmt-host") == False + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == None + assert config.management_credentials_of("mgmt-host") == "HOST" - import cmk.debug - cmk.debug.enable() - import cmk_base.checks as checks - checks.load() +def test_mgmt_inherit_credentials_explicit_host(web): + web.add_folder("folder1", attributes={ + "management_snmp_community": "FOLDER", + }) + + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + "management_snmp_community": "HOST", + }) + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "HOST" - yield None - # - # Cleanup code - # - print "Cleaning up test config" - cmk.debug.disable() +def test_mgmt_inherit_credentials(web): + web.add_folder("folder1", attributes={ + "management_snmp_community": "FOLDER", + }) - web.delete_host("mgmt-host1") - web.delete_host("mgmt-host2") - web.delete_host("mgmt-host3") - web.activate_changes() + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + }) + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "FOLDER" -def test_management_board_configc(test_cfg): - assert config.has_management_board("mgmt-host1") - assert config.management_address_of("mgmt-host1") == "127.0.0.1" - assert config.management_protocol_of("mgmt-host1") == "snmp" - assert config.management_credentials_of("mgmt-host1") == "HOST" - assert config.has_management_board("mgmt-host2") - assert config.management_address_of("mgmt-host2") == "127.0.0.2" - assert config.management_protocol_of("mgmt-host2") == "snmp" - assert config.management_credentials_of("mgmt-host2") == "public" +def test_mgmt_inherit_protocol_explicit_host(web): + web.add_folder("folder1", attributes={ + "management_protocol": None, + "management_snmp_community": "FOLDER", + }) - assert config.has_management_board("mgmt-host3") == False - assert config.management_address_of("mgmt-host3") == "127.0.0.1" - assert config.management_protocol_of("mgmt-host3") == None - assert config.management_credentials_of("mgmt-host3") == "HOST" + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + "management_snmp_community": "HOST", + }) + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "HOST" + + + +def test_mgmt_inherit_protocol(web): + web.add_folder("folder1", attributes={ + "management_protocol": "snmp", + "management_snmp_community": "FOLDER", + }) + + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + }) + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "FOLDER"

6 years, 4 months

5741 FIX isc_dhcpd: allow dynamic-bootp entries

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 0bf6b8a78d2fd49e3b61328ce0734b4bd03188c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bf6b8a78d2fd4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Feb 19 15:33:16 2018 +0100 5741 FIX isc_dhcpd: allow dynamic-bootp entries Change-Id: I5cd457fe263d8ca91c4ef8b24fe1c8e7575f5eaa --- .werks/5741 | 10 ++++++++++ checks/isc_dhcpd | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/5741 b/.werks/5741 new file mode 100644 index 0000000..1338f4c --- /dev/null +++ b/.werks/5741 @@ -0,0 +1,10 @@ +Title: isc_dhcpd: allow dynamic-bootp entries +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519050737 +Class: fix + + diff --git a/checks/isc_dhcpd b/checks/isc_dhcpd index 06f8f60..c6c95e8 100644 --- a/checks/isc_dhcpd +++ b/checks/isc_dhcpd @@ -75,6 +75,8 @@ def parse_isc_dhcpd(info): parsed["pids"] = map(int, line[1:]) elif mode == "pools": + if 'bootp' in line[0]: + line = line[1:] start, end = line[0], line[1] item = "%s-%s" % (start, end) parsed["pools"][item] = (ip_to_number(start), ip_to_number(end))

6 years, 4 months

Removed none value from management board config ruleset

by Lars Michelsen

Module: check_mk Branch: master Commit: b52139d43909080e64d6cad8129dafad3fc3efe5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b52139d4390908… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 12:47:49 2018 +0100 Removed none value from management board config ruleset Change-Id: I561d173d220967f9e5517112884a150df4b52f04 --- web/plugins/wato/check_mk_configuration.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 091396b..635f49d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2333,7 +2333,6 @@ register_rule(group, CascadingDropdown( title=_("Management board config"), choices=[ - (None, _("No protocol specified"), FixedValue(None, totext="")), ("snmp", _("SNMP"), SNMPCredentials()), ], ),

6 years, 4 months

Tests: Selected version was not propagated to the site test process

by Lars Michelsen

Module: check_mk Branch: master Commit: 4654697f9a552a35a0edd2d385403538e6cb730d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4654697f9a552a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 08:19:21 2018 +0100 Tests: Selected version was not propagated to the site test process Change-Id: I602421f83c3170a98d4ec6203b66ae53bb96b3c2 --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 28966b5..a6c99ea 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -745,7 +745,7 @@ class Site(object): # Check_MK is now the site, so all tests that somehow rely on the environment should be # executed this way. def switch_to_site_user(self): - env_var_str = "" + env_var_str = "VERSION='%s' " % self.version._version if "WORKSPACE" in os.environ: env_var_str = "WORKSPACE='%s' " % os.environ["WORKSPACE"]

6 years, 4 months

Add add_folder(), delete_folder(), folder_exists(), delete_folder() and host_exists() methods to web fixture

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b7489391a5dbe6e057c9545f5cc29370bb1e56a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b7489391a5dbe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 11:27:24 2018 +0100 Add add_folder(), delete_folder(), folder_exists(), delete_folder() and host_exists() methods to web fixture Change-Id: I0ea581b7d061d938bb39df55f1d5df56100a7868 --- tests/testlib/__init__.py | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index a6c99ea..556749c 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1148,6 +1148,83 @@ class CMKWebSession(WebSession): return result + def host_exists(self, hostname): + try: + result = self._api_request("webapi.py?action=get_host", { + "request": json.dumps({ + "hostname": hostname, + }), + }) + except AssertionError, e: + if "No such host" in "%s" % e: + return False + else: + raise + + assert type(result) == dict + return "hostname" in result + + + def add_folder(self, folder_path, attributes=None, create_folders=True, expect_error=False): + if attributes == None: + attributes = {} + + result = self._api_request("webapi.py?action=add_folder", { + "request": json.dumps({ + "folder" : folder_path, + "attributes" : attributes or {}, + "create_parent_folders" : create_folders, + }), + }, expect_error=expect_error) + + assert result == None + + folder = self.get_folder(folder_path) + assert folder["attributes"] == attributes + + + def get_folder(self, folder_path, effective_attributes=False): + result = self._api_request("webapi.py?action=get_folder", { + "request": json.dumps({ + "folder" : folder_path, + "effective_attributes" : effective_attributes, + }), + }) + + assert type(result) == dict + assert "attributes" in result + + return result + + + def folder_exists(self, folder_path): + try: + result = self._api_request("webapi.py?action=get_folder", { + "request": json.dumps({ + "folder": folder_path, + }), + }) + except AssertionError, e: + if "does not exist" in "%s" % e: + return False + else: + raise + + assert type(result) == dict + return "folder" in result + + + def delete_folder(self, folder_path): + result = self._api_request("webapi.py?action=delete_folder", { + "request": json.dumps({ + "folder": folder_path, + }), + }) + + assert result == None + assert not self.folder_exists(folder_path) + + def get_ruleset(self, ruleset_name): result = self._api_request("webapi.py?action=get_ruleset&output_format=python", { "request": json.dumps({

6 years, 4 months

5852 FIX Fixed broken "Management board SNMP credentials" inheritance

by Lars Michelsen

Module: check_mk Branch: master Commit: 2dce1d4b98e2888650d52d1eefae42f044bdaa5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dce1d4b98e288… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 07:20:31 2018 +0100 5852 FIX Fixed broken "Management board SNMP credentials" inheritance SNMP credentials for management board that were set on folders were not inherited to hosts. Change-Id: I8a9c9c6c91539bdfa50068dbb303129407f9ce83 --- .werks/5852 | 16 +++++++++ cmk_base/check_table.py | 2 +- cmk_base/config.py | 59 +++++++++------------------------- cmk_base/data_sources/__init__.py | 2 +- cmk_base/data_sources/snmp.py | 10 +++++- cmk_base/default_config/base.py | 6 +++- web/htdocs/watolib.py | 32 ++++++++++-------- web/plugins/wato/builtin_attributes.py | 21 ++++++++++-- 8 files changed, 84 insertions(+), 64 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2dce1d4b98…

6 years, 4 months

← Newer
1
...
7
8
9
10
11
12
13
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018