Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: a4d9451cb646be5ef7f9aec3f974aa43e53c8cd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4d9451cb646be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 13:39:10 2016 +0100 Updated bug entries #2473 --- .bugs/2473 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2473 b/.bugs/2473 new file mode 100644 index 0000000..9fffa17 --- /dev/null +++ b/.bugs/2473 @@ -0,0 +1,10 @@ +Title: Virtual host trees should have ids +Component: multisite +State: open +Date: 2016-12-05 13:37:42 +Targetversion: 1.2.9 +Class: bug + +The virtual host trees are currently being referenced by their index. In case a tree is deleted, the +tree that a user references may change because the elements in the list virtual_host_trees have +different indexes now.

7 years, 7 months

4128 FIX Fixed exception in "Virtual host tree" snapin in case a user tries to access a not existing tree

by Lars Michelsen

Module: check_mk Branch: master Commit: 7221fcec3e09d0aabd3285507dbeb2129c590a20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7221fcec3e09d0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 13:35:42 2016 +0100 4128 FIX Fixed exception in "Virtual host tree" snapin in case a user tries to access a not existing tree --- .werks/4128 | 10 ++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 7 +++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/4128 b/.werks/4128 new file mode 100644 index 0000000..a495669 --- /dev/null +++ b/.werks/4128 @@ -0,0 +1,10 @@ +Title: Fixed exception in "Virtual host tree" snapin in case a user tries to access a not existing tree +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480941304 + + diff --git a/ChangeLog b/ChangeLog index 2dd9262..be8768d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * 4072 FIX: Fixed multiple issues in BI availability when groups or names contain umlauts * 4080 FIX: Fixed possible exception "unsupported operand type" in matrix views * 4127 FIX: Fixed possible "maximum recursion depth exceeded" error when sorting tables with a lot of text in cells + * 4128 FIX: Fixed exception in "Virtual host tree" snapin in case a user tries to access a not existing tree WATO: * 3984 Permissions can now be filtered by providing a search term on the "edit role" page... diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 2350bc3..83766ff 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -2056,7 +2056,6 @@ def render_tag_tree(): if type(tree_conf) == int: tree_conf = {"tree": tree_conf, "cwd":{}} # convert from old style - choices = [ (str(i), v[0]) for i, v in enumerate(config.virtual_host_trees)] html.begin_form("vtree") @@ -2071,7 +2070,11 @@ def render_tag_tree(): html.end_form() html.final_javascript(virtual_host_tree_js) - title, taggroups = config.virtual_host_trees[tree_conf["tree"]] + try: + title, taggroups = config.virtual_host_trees[tree_conf["tree"]] + except IndexError: + # Fallback to first host tree in case the wanted does not exist (anymore) + title, taggroups = config.virtual_host_trees[0] tree = compute_tag_tree(taggroups) render_tag_tree_level(taggroups, [], cwd, _("Virtual Host Tree"), tree)

7 years, 7 months

4127 FIX Fixed possible "maximum recursion depth exceeded"

by Lars Michelsen

error when sorting tables with a lot of text in cells Message-ID: <58455b37.q0KqRoQ55eaEjW9T%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: eb6439343f6197fb31e4cbf095a50a877823ceb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb6439343f6197… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 13:18:42 2016 +0100 4127 FIX Fixed possible "maximum recursion depth exceeded" error when sorting tables with a lot of text in cells --- .werks/4127 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/lib.py | 24 +++++++++--------------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.werks/4127 b/.werks/4127 new file mode 100644 index 0000000..7a1d96f --- /dev/null +++ b/.werks/4127 @@ -0,0 +1,10 @@ +Title: Fixed possible "maximum recursion depth exceeded" error when sorting tables with a lot of text in cells +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480940237 + + diff --git a/ChangeLog b/ChangeLog index 55f38d6..2dd9262 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * 4071 FIX: Removed notes_url from "LOG *" logwatch services... * 4072 FIX: Fixed multiple issues in BI availability when groups or names contain umlauts * 4080 FIX: Fixed possible exception "unsupported operand type" in matrix views + * 4127 FIX: Fixed possible "maximum recursion depth exceeded" error when sorting tables with a lot of text in cells WATO: * 3984 Permissions can now be filtered by providing a search term on the "edit role" page... diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 913a492..da18e42 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -368,21 +368,15 @@ release_all_locks = store.release_all_locks # into int datatype. That way a naturual sort can be # implemented. def num_split(s): - if not s: - return () - elif s[0].isdigit(): - first_num = regex("[^0-9]").split(s)[0] - return ( int(first_num), ) + num_split(s[len(first_num):]) - else: - first_word = regex("[0-9]").split(s)[0] - return ( first_word.lower(), ) + num_split(s[len(first_word):]) - - # exp = int(math.log10(x)) - # mantissa = x / 10**exp - # if mantissa < 1: - # mantissa *= 10 - # exp -= 1 - # return mantissa, exp + parts = [] + for part in re.split('(\d+)', s): + try: + parts.append(int(part)) + except ValueError: + parts.append(part) + + return tuple(parts) + def cmp_service_name_equiv(r): if r == "Check_MK":

7 years, 7 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 2276883e978688ffc48499b801cb52f138f05087 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2276883e978688… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 13:17:04 2016 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 769b084..d3a0a43 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4127 +4147

7 years, 7 months

Updated bug entries #2547

by Mathias Kettner

Module: check_mk Branch: master Commit: 7be5aa3128858a32aa1d8167f828d3c47ede0616 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7be5aa3128858a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 5 13:05:39 2016 +0100 Updated bug entries #2547 --- .bugs/2547 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2547 b/.bugs/2547 new file mode 100644 index 0000000..a30fd1c --- /dev/null +++ b/.bugs/2547 @@ -0,0 +1,12 @@ +Title: Event Console delete icon does not work if checkboxes are enabled +Component: ec +State: open +Date: 2016-12-05 13:04:28 +Targetversion: 1.2.8 +Class: bug + +If you activate checkboxes and the use the delete icon for +deleting one event you will run into an error message that +no items are selected. I fear that I some *would* be selected, +then all those would be deleted instead of just that one +where the icon was clicked.

7 years, 7 months

Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: c46e8020a70825154484c23106b2547dbe2f40f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c46e8020a70825… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 5 13:04:25 2016 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index efbf27c..45f6930 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2547 +2557

7 years, 7 months

Commented out test which testing code has not been merged yet

by Lars Michelsen

Module: check_mk Branch: master Commit: fa76bc05f25bcf5fb118ff923cf038557c6f66a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa76bc05f25bcf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 12:11:30 2016 +0100 Commented out test which testing code has not been merged yet --- tests/web/test_generator.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/web/test_generator.py b/tests/web/test_generator.py index 6195dfa..360edf1 100644 --- a/tests/web/test_generator.py +++ b/tests/web/test_generator.py @@ -16,17 +16,17 @@ from htmllib import HTML, HTMLGenerator -def test_HTMLGenerator(): - - html = HTMLGenerator() - html.plug() - - html.open_div() - assert html.drain() == "<div>" - - html.open_div().write("test").close_div() - assert html.drain() == "<div>test</div>" - - html.open_table().open_tr().td("1").td("2").close_tr().close_table() - assert html.drain() == "<table><tr><td>1</td><td>2</td></tr></table>" - +#def test_HTMLGenerator(): +# +# html = HTMLGenerator() +# html.plug() +# +# html.open_div() +# assert html.drain() == "<div>" +# +# html.open_div().write("test").close_div() +# assert html.drain() == "<div>test</div>" +# +# html.open_table().open_tr().td("1").td("2").close_tr().close_table() +# assert html.drain() == "<table><tr><td>1</td><td>2</td></tr></table>" +#

7 years, 7 months

Fixed get_graph test

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a69ff66cbc14f114151f5ed741d7c1e9e31e411 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a69ff66cbc14f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 11:52:52 2016 +0100 Fixed get_graph test --- tests/testlib/__init__.py | 4 ---- tests/web/test_webapi.py | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 454c33a..2f1b5c7 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -682,10 +682,6 @@ class CMKWebSession(WebSession): assert response["result_code"] == 0, \ "An error occured: %r" % response else: - assert response["result_code"] == 1, \ - "No error occured, but was expected: %r" % response - - print repr(response["result"]) raise APIError(response["result"]) return response["result"] diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index de03f96..ad8efe8 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -84,7 +84,21 @@ def test_get_graph(web, site): # Issue a reschedule site.live.command("SCHEDULE_FORCED_SERVICE_CHECK;test-host-get-graph;Check_MK;%d" % int(time.time())) - time.sleep(1) + + # Wait for RRD file creation + # Isn't this a bug that the graph is not instantly available? + timeout = 10 + print "Checking for graph..." + while timeout and not site.file_exists("var/check_mk/rrd/test-host-get-graph/Check_MK.rrd"): + try: + data = web.get_regular_graph("test-host-get-graph", "Check_MK", 0, expect_error=True) + except Exception: + pass + timeout -= 1 + time.sleep(1) + print "Checking for graph..." + assert site.file_exists("var/check_mk/rrd/test-host-get-graph/Check_MK.rrd"), \ + "RRD %s is still missing" % "var/check_mk/rrd/test-host-get-graph/Check_MK.rrd" # Now we get a graph data = web.get_regular_graph("test-host-get-graph", "Check_MK", 0)

7 years, 7 months

4084 FIX Improved error handling in case of broken hosts.mk files

by Lars Michelsen

Module: check_mk Branch: master Commit: 1cf16d6f1a25c273d836d4338fe2c27c9c84e946 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cf16d6f1a25c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 11:27:45 2016 +0100 4084 FIX Improved error handling in case of broken hosts.mk files --- .werks/4084 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4084 b/.werks/4084 new file mode 100644 index 0000000..061f4fb --- /dev/null +++ b/.werks/4084 @@ -0,0 +1,9 @@ +Title: Improved error handling in case of broken hosts.mk files +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i3 +Date: 1480933648 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 45b447f..55f38d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 4077 FIX: Fixed "Request URI too long" when cloning role after editing another one * 4079 FIX: Improved error handling in case a WATO folder can not be written * 4082 FIX: Icon selector: Fixed exception in case non images are saved in icon folder + * 4084 FIX: Improved error handling in case of broken hosts.mk files Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 068222a..3672778 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -914,8 +914,7 @@ class Folder(BaseFolder): "service_contactgroups" : [], "_lock" : False, } - execfile(self.hosts_file_path(), variables, variables) - return variables + return store.load_mk_file(self.hosts_file_path(), variables) def save_hosts(self): @@ -926,6 +925,7 @@ class Folder(BaseFolder): call_hook_hosts_changed(self) + # TODO: Use the store functions here! def _save_hosts_file(self): self._ensure_folder_directory() if not self.has_hosts():

7 years, 7 months

Small code change to be able to see response content in crash reports

by Lars Michelsen

Module: check_mk Branch: master Commit: cb769bd59146ff96d6211b9a9e499782c40e3c1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb769bd59146ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 11:14:01 2016 +0100 Small code change to be able to see response content in crash reports --- web/htdocs/sites.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index cd0e700..0e7844d 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -111,10 +111,13 @@ def _connect_multiple_sites(): # Fetch status of sites by querying the version of Nagios and livestatus # This may be cached by a proxy for up to the next configuration reload. _live.set_prepend_site(True) - for site_id, v1, v2, ps, num_hosts, num_services in _live.query( + for response in _live.query( "GET status\n" "Cache: reload\n" "Columns: livestatus_version program_version program_start num_hosts num_services"): + + site_id, v1, v2, ps, num_hosts, num_services = response + _update_site_status(site_id, { "state" : "online", "livestatus_version" : v1,

7 years, 7 months

← Newer
1
...
33
34
35
36
37
38
39
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016