Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 0d581cac54cdfd12372e8763cf249f135d2a07ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d581cac54cdfd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 18 14:09:52 2017 +0200 Fixed boost_system detection. Change-Id: If51a26e362fc3afd9e0c39930bdbeeea11301025 --- m4/ax_boost_asio.m4 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/m4/ax_boost_asio.m4 b/m4/ax_boost_asio.m4 index a72c1e1..e18c3d1 100644 --- a/m4/ax_boost_asio.m4 +++ b/m4/ax_boost_asio.m4 @@ -83,6 +83,10 @@ AC_DEFUN([AX_BOOST_ASIO], AC_DEFINE(HAVE_BOOST_ASIO,,[define if the Boost::ASIO library is available]) BN=boost_system BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + # NOTE: The AC_LANG_PUSH/POP below is a local modification! Without it, AC_CHECK_LIB + # would use the C compiler for compilation and linking of C++ libraries, which is wrong + # in general: C++ compilers usually add some magic linking flags etc. behind the scenes. + AC_LANG_PUSH([C++]) if test "x$ax_boost_user_asio_lib" = "x"; then for ax_lib in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.dylib* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib$boost_system.*$\.so.*$;\1;' -e 's;^lib$boost_system.*$\.dylib.*$;\1;' -e 's;^lib$boost_system.*$\.a.*$;\1;' ` ; do AC_CHECK_LIB($ax_lib, main, [BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_thread="yes" break], @@ -96,6 +100,7 @@ AC_DEFUN([AX_BOOST_ASIO], done fi + AC_LANG_POP([C++]) if test "x$ax_lib" = "x"; then AC_MSG_ERROR(Could not find a version of the library!) fi

7 years, 4 months

Another try to fix accidental removal of mknotifyd global settings

by Lars Michelsen

Module: check_mk Branch: master Commit: 24cc1ae976870a6c2c31788ac185c762b5258edb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24cc1ae976870a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 18 13:28:59 2017 +0200 Another try to fix accidental removal of mknotifyd global settings Change-Id: Icf69304132cb896b8d78fec068e3eed7ed7a84eb --- web/htdocs/watolib.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index d3c3716..daee77c 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3279,20 +3279,20 @@ def save_global_settings(vars, site_specific=False): for varname, (domain, valuespec, need_restart, allow_reset, in_global_settings) in g_configvars.items(): if varname not in vars: continue - per_domain.setdefault(domain, {})[varname] = vars[varname] + per_domain.setdefault(domain.ident, {})[varname] = vars[varname] # The global setting wato_enabled is not registered in the configuration domains # since the user must not change it directly. It is set by D-WATO on slave sites. if "wato_enabled" in vars: - per_domain.setdefault(ConfigDomainGUI, {})["wato_enabled"] = vars["wato_enabled"] + per_domain.setdefault(ConfigDomainGUI.ident, {})["wato_enabled"] = vars["wato_enabled"] if "userdb_automatic_sync" in vars: - per_domain.setdefault(ConfigDomainGUI, {})["userdb_automatic_sync"] = vars["userdb_automatic_sync"] + per_domain.setdefault(ConfigDomainGUI.ident, {})["userdb_automatic_sync"] = vars["userdb_automatic_sync"] for domain in ConfigDomain.enabled_domains(): if site_specific: - domain().save_site_globals(per_domain.get(domain, {})) + domain().save_site_globals(per_domain.get(domain.ident, {})) else: - domain().save(per_domain.get(domain, {})) + domain().save(per_domain.get(domain.ident, {})) def save_site_global_settings(vars):

7 years, 4 months

Minor code formating cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 509dd4a44d16fd4e614449455aa8ac3c2507f155 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=509dd4a44d16fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 18 13:24:09 2017 +0200 Minor code formating cleanup Change-Id: I28295193f54ac3cc48908fb14fde459b0a75fe6c --- web/htdocs/watolib.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index ddc9ecf..d3c3716 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -7535,9 +7535,6 @@ def find_usages_of_service_group(name): #. - - - # .--Notifications-(Rule Based)------------------------------------------. # | _ _ _ _ __ _ _ _ | # | | \ | | ___ | |_(_)/ _(_) ___ __ _| |_(_) ___ _ __ ___ |

7 years, 4 months

Added get_stats() method to perform some basic cache usage tests

by Lars Michelsen

Module: check_mk Branch: master Commit: c0f9e48505f3a9730f74aab08d9673c297f26205 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0f9e48505f3a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 18 12:05:55 2017 +0200 Added get_stats() method to perform some basic cache usage tests Change-Id: Ia584240e2f4a8abe7e780d6462aab45ec7233c11 --- cmk_base/caching.py | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/cmk_base/caching.py b/cmk_base/caching.py index de679e0..0b95948 100644 --- a/cmk_base/caching.py +++ b/cmk_base/caching.py @@ -83,7 +83,35 @@ class Cache(object): # Just a small wrapper round a dict to get some caching specific functionality # for analysis etc. class DictCache(dict, Cache): - pass + def __init__(self, *args, **kwargs): + super(Cache, self).__init__(*args, **kwargs) + self._num_hits = 0 + self._num_misses = 0 + self._num_sets = 0 + + + def __getitem__(self, y): + try: + result = super(DictCache, self).__getitem__( y) + self._num_hits += 1 + return result + except KeyError: + self._num_misses += 1 + raise + + + def __setitem__(self, i, y): + self._num_sets += 1 + super(DictCache, self).__setitem__(i, y) + + + def get_stats(self): + return { + "sets" : self._num_sets, + "hits" : self._num_hits, + "misses" : self._num_misses, + "items" : len(self), + } class SetCache(set, Cache):

7 years, 4 months

CMK helpers: In verbose mode and when memory usage increased also dump out the estimated cache sizes

by Lars Michelsen

Module: check_mk Branch: master Commit: becdad93cc719c387aa92f5783584a0caff0eee2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=becdad93cc719c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 18 11:16:04 2017 +0200 CMK helpers: In verbose mode and when memory usage increased also dump out the estimated cache sizes Change-Id: I0be0aafe018df6934f445f93e23270f5a4d4bd70 --- cmk_base/caching.py | 8 ++++++++ cmk_base/utils.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/cmk_base/caching.py b/cmk_base/caching.py index 3f98b89..de679e0 100644 --- a/cmk_base/caching.py +++ b/cmk_base/caching.py @@ -28,6 +28,7 @@ from cmk.exceptions import MKGeneralException +import cmk_base.utils class CacheManager(object): def __init__(self): @@ -66,6 +67,13 @@ class CacheManager(object): cache.clear() + def dump_sizes(self): + sizes = {} + for name, cache in self._caches.items(): + sizes[name] = cmk_base.utils.total_size(cache) + return sizes + + class Cache(object): def is_empty(self): diff --git a/cmk_base/utils.py b/cmk_base/utils.py index 36ecde2..d11deb7 100644 --- a/cmk_base/utils.py +++ b/cmk_base/utils.py @@ -29,6 +29,9 @@ Check_MK modules and/or cmk_base modules code.""" # TODO: Try to find a better place for them. +import sys +import itertools + # Works with Check_MK version (without tailing .cee and/or .demo) def is_daily_build_version(v): @@ -87,3 +90,44 @@ def parse_check_mk_version(v): val = 20000 + num*100 return int('%02d%02d%02d%05d' % (int(major), int(minor), sub, val)) + + +def total_size(o, handlers=None): + """ Returns the approximate memory footprint an object and all of its contents. + + Automatically finds the contents of the following builtin containers and + their subclasses: tuple, list, dict, set and frozenset. + To search other containers, add handlers to iterate over their contents: + + handlers = {SomeContainerClass: iter, + OtherContainerClass: OtherContainerClass.get_elements} + + """ + if handlers == None: + handlers = {} + + dict_handler = lambda d: itertools.chain.from_iterable(d.items()) + all_handlers = {tuple: iter, + list: iter, + dict: dict_handler, + set: iter, + frozenset: iter, + } + all_handlers.update(handlers) # user handlers take precedence + seen = set() # track which object id's have already been seen + default_size = sys.getsizeof(0) # estimate sizeof object without __sizeof__ + + def sizeof(o): + if id(o) in seen: # do not double count the same object + return 0 + seen.add(id(o)) + s = sys.getsizeof(o, default_size) + + + for typ, handler in all_handlers.items(): + if isinstance(o, typ): + s += sum(map(sizeof, handler(o))) + break + return s + + return sizeof(o)

7 years, 4 months

Set default values of recently changed API calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 780778cb39150636ba2c7768d22ea704478c6c54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=780778cb391506… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 18 11:28:20 2017 +0200 Set default values of recently changed API calls Change-Id: I0394813fd0488bb8a6f83df45714de11bbc3a93c --- web/plugins/webapi/webapi.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 1674cca..cae9ff3 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -108,7 +108,7 @@ def action_add_host(request): validate_request_keys(request, required_keys=["hostname", "folder"], optional_keys=["attributes", "nodes", "create_folders"]) - create_folders = int(request.get("create_folders")) == 1 + create_folders = int(request.get("create_folders", "1")) == 1 hostname = request.get("hostname") folder_path = request.get("folder") @@ -199,7 +199,7 @@ def action_get_host(request): host = Host.host(hostname) host.need_permission("read") - if int(request.get("effective_attributes")) == 1: + if int(request.get("effective_attributes", "0")) == 1: attributes = host.effective_attributes() else: attributes = host.attributes() @@ -219,7 +219,7 @@ api_actions["get_host"] = { def action_get_all_hosts(request): validate_request_keys(request, optional_keys=["effective_attributes"]) - effective_attributes = int(request.get("effective_attributes")) == 1 + effective_attributes = int(request.get("effective_attributes", "0")) == 1 response = {} all_hosts = Folder.root_folder().all_hosts_recursively()

7 years, 4 months

New tests for get_host/get_all_hosts API calls

by Lars Michelsen

Module: check_mk Branch: master Commit: c0b144eb9a045390808202a2c871ae981d5f8499 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0b144eb9a0453… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 18 08:35:41 2017 +0200 New tests for get_host/get_all_hosts API calls - Ensure effective_attributes work - Check whether or not host tags in hosts.mk are written correctly Change-Id: I3a91b9ca2b00f405d49edc16ee6cc56ff49fa694 --- tests/testlib/__init__.py | 9 ++--- tests/web/test_webapi.py | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 36aa4a2..fa7480e 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -931,10 +931,11 @@ class CMKWebSession(WebSession): assert host["attributes"] == attributes - def get_host(self, hostname): + def get_host(self, hostname, effective_attributes=False): result = self._api_request("webapi.py?action=get_host", { "request": json.dumps({ - "hostname" : hostname, + "hostname" : hostname, + "effective_attributes" : effective_attributes, }), }) @@ -946,7 +947,7 @@ class CMKWebSession(WebSession): return result - def get_all_hosts(self, effective_attributes=0): + def get_all_hosts(self, effective_attributes=False): result = self._api_request("webapi.py?action=get_all_hosts", { "request": json.dumps({ "effective_attributes": effective_attributes, @@ -966,7 +967,7 @@ class CMKWebSession(WebSession): assert result == None - hosts = self.get_all_hosts(hostname) + hosts = self.get_all_hosts() assert hostname not in hosts diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index 709daa6..7b67637 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -43,6 +43,91 @@ def test_delete_host(web): web.delete_host("test-host-delete") +def test_get_host_effective_attributes(web): + try: + web.add_host("test-host", attributes={ + "ipaddress": "127.0.0.1", + }) + + host = web.get_host("test-host", effective_attributes=False) + assert "tag_networking" not in host["attributes"] + + host = web.get_host("test-host", effective_attributes=True) + assert "tag_networking" in host["attributes"] + assert host["attributes"]["tag_networking"] == "lan" + finally: + web.delete_host("test-host") + + +def test_get_all_hosts_effective_attributes(web): + try: + web.add_host("test-host", attributes={ + "ipaddress": "127.0.0.1", + }) + + hosts = web.get_all_hosts(effective_attributes=False) + host = hosts["test-host"] + assert "tag_networking" not in host["attributes"] + + hosts = web.get_all_hosts(effective_attributes=True) + host = hosts["test-host"] + assert "tag_networking" in host["attributes"] + assert host["attributes"]["tag_networking"] == "lan" + finally: + web.delete_host("test-host") + + +def test_write_host_tags(web, site): + try: + web.add_host("test-host-dmz", attributes={ + "ipaddress": "127.0.0.1", + "tag_networking": "dmz", + }) + + web.add_host("test-host-lan", attributes={ + "ipaddress": "127.0.0.1", + "tag_networking": "lan", + }) + + web.add_host("test-host-lan2", attributes={ + "ipaddress": "127.0.0.1", + }) + + hosts = web.get_all_hosts(effective_attributes=True) + assert hosts["test-host-dmz"]["attributes"]["tag_networking"] == "dmz" + assert hosts["test-host-lan"]["attributes"]["tag_networking"] == "lan" + assert hosts["test-host-lan2"]["attributes"]["tag_networking"] == "lan" + + cfg = { + "FOLDER_PATH": "/", + "all_hosts": [], + "ipaddresses": {}, + "host_attributes": {}, + } + + exec(site.read_file("etc/check_mk/conf.d/wato/hosts.mk"), cfg, cfg) + + tags_by_host = {} + for entry in cfg["all_hosts"]: + hostname, tag_txt = entry.split("|", 1) + tags_by_host[hostname] = tag_txt.split("|") + + + assert "dmz" in tags_by_host["test-host-dmz"] + assert "lan" not in tags_by_host["test-host-dmz"] + + assert "dmz" not in tags_by_host["test-host-lan"] + assert "lan" in tags_by_host["test-host-lan"] + + assert "dmz" not in tags_by_host["test-host-lan2"] + assert "lan" in tags_by_host["test-host-lan2"] + + finally: + web.delete_host("test-host-lan2") + web.delete_host("test-host-lan") + web.delete_host("test-host-dmz") + + @pytest.mark.parametrize(("group_type"), [ "contact", "host", "service" ]) def test_add_group(web, group_type): group_id = "%s_testgroup_id" % group_type

7 years, 4 months

New tests to verify create_folders parameter of the add_host API call

by Lars Michelsen

Module: check_mk Branch: master Commit: 78850a561e226fcdfc0a3154b94ec671361d18ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78850a561e226f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 18 09:18:21 2017 +0200 New tests to verify create_folders parameter of the add_host API call Change-Id: I737c1abdc904bbd1cbb8e5ec2aebb9805f7ec1f8 --- tests/testlib/__init__.py | 14 ++++++++------ tests/web/test_webapi.py | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index fa7480e..9f53180 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -913,21 +913,23 @@ class CMKWebSession(WebSession): return response["result"] - def add_host(self, hostname, folder="/", attributes=None): + def add_host(self, hostname, folder="/", attributes=None, create_folders=True, expect_error=False): result = self._api_request("webapi.py?action=add_host", { "request": json.dumps({ - "hostname" : hostname, - "folder" : folder, - "attributes" : attributes or {}, + "hostname" : hostname, + "folder" : folder, + "attributes" : attributes or {}, + "create_folders" : create_folders, }), - }) + }, expect_error=expect_error) assert result == None host = self.get_host(hostname) + print host assert host["hostname"] == hostname - assert host["path"] == "" + assert host["path"] == folder assert host["attributes"] == attributes diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index 7b67637..7d0d79b 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -22,6 +22,30 @@ def test_add_host(web): web.delete_host("test-host") +def test_add_host_folder_create(web): + web.add_host("test-host", attributes={ + "ipaddress": "127.0.0.1", + }, + create_folders=True, + folder="asd/eee", + ) + + web.delete_host("test-host") + + +def test_add_host_no_folder_create(web): + with pytest.raises(APIError) as e: + web.add_host("test-host", attributes={ + "ipaddress": "127.0.0.1", + }, + create_folders=False, + folder="eins/zwei", + expect_error=True, + ) + + assert "Folder not existing" in "%s" % e + + def test_get_all_hosts_basic(web): try: web.add_host("test-host-list", attributes={

7 years, 4 months

4724 FIX Web-API: Fixed create_folder parameter of add_host call

by Lars Michelsen

Module: check_mk Branch: master Commit: 9b70e4124cc395d18d6ebd79370c6d4e7a161087 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b70e4124cc395… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 18 09:16:46 2017 +0200 4724 FIX Web-API: Fixed create_folder parameter of add_host call The call was always creating missing folders regardless of the create_folder parameter. Change-Id: I5af15ac3959bc5a6c88d5fcf0c842401b908e96d --- .werks/4724 | 12 ++++++++++++ web/plugins/webapi/webapi.py | 5 +---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.werks/4724 b/.werks/4724 new file mode 100644 index 0000000..628d746 --- /dev/null +++ b/.werks/4724 @@ -0,0 +1,12 @@ +Title: Web-API: Fixed create_folder parameter of add_host call +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1495091774 + +The call was always creating missing folders regardless of the create_folder +parameter. diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 2f07a5f..1674cca 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -108,10 +108,7 @@ def action_add_host(request): validate_request_keys(request, required_keys=["hostname", "folder"], optional_keys=["attributes", "nodes", "create_folders"]) - if html.var("create_folders"): - create_folders = bool(int(html.var("create_folders"))) - else: - create_folders = True + create_folders = int(request.get("create_folders")) == 1 hostname = request.get("hostname") folder_path = request.get("folder")

7 years, 4 months

4723 FIX Web-API: Fixed effective_attributes parameter for get_host/ get_all_hosts calls

by Lars Michelsen

Module: check_mk Branch: master Commit: ccbaa70428f3373b79aba545d8f6510ab9d40fd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccbaa70428f337… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 18 08:35:22 2017 +0200 4723 FIX Web-API: Fixed effective_attributes parameter for get_host/get_all_hosts calls The parameter effective_attributes was simply ignored. The calls were always returning the explicitly configured attributes. Change-Id: If56cd11798526aea9015e6ba6b316315fc2f2b19 --- .werks/4723 | 12 ++++++++++++ web/plugins/webapi/webapi.py | 8 +++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/4723 b/.werks/4723 new file mode 100644 index 0000000..dadaa1d --- /dev/null +++ b/.werks/4723 @@ -0,0 +1,12 @@ +Title: Web-API: Fixed effective_attributes parameter for get_host/get_all_hosts calls +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1495089250 + +The parameter effective_attributes was simply ignored. The calls were always +returning the explicitly configured attributes. diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 4a8ff22..2f07a5f 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -201,7 +201,8 @@ def action_get_host(request): host = Host.host(hostname) host.need_permission("read") - if html.var("effective_attributes") == "1": + + if int(request.get("effective_attributes")) == 1: attributes = host.effective_attributes() else: attributes = host.attributes() @@ -221,10 +222,7 @@ api_actions["get_host"] = { def action_get_all_hosts(request): validate_request_keys(request, optional_keys=["effective_attributes"]) - if html.var("effective_attributes"): - effective_attributes = bool(int(html.var("effective_attributes"))) - else: - effective_attributes = False + effective_attributes = int(request.get("effective_attributes")) == 1 response = {} all_hosts = Folder.root_folder().all_hosts_recursively()

7 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017