Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

by Andreas Umbreit

Module: check_mk Branch: master Commit: 20cd475fccf189c4723f026682a6f3265fc4308f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20cd475fccf189… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Oct 30 14:21:49 2017 +0100 add werk 5261 Change-Id: I69a63567e28227fd58f0b330af9b66cf274c4ed7 --- .werks/5261 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5261 b/.werks/5261 new file mode 100644 index 0000000..4094d04 --- /dev/null +++ b/.werks/5261 @@ -0,0 +1,13 @@ +Title: Improve agent bakery robustness when baking new agents +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1509360187 +Class: fix + +Depending on the complexity of the underlying configuration ruleset, some agents accidently could be marked as to be rebaked although there is no config change for them. +This is now mitigated by applying a more robust hashing algorithm for the agent config hashes. + +After updating, no further action is required to apply the fix. Notably, no re-bake of existing agents is required.

6 years, 8 months

Fixed column/ filter hierarchy more for lists of services and service group members.

by Sven Panne

Module: check_mk Branch: master Commit: a04ccb94d8b11ee61c979dfdc4631ea3eb2e3204 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a04ccb94d8b11e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 14:22:16 2017 +0200 Fixed column/filter hierarchy more for lists of services and service group members. * Obey AuthUser consistenly in output *and* filters. * Unified code. * Made more operators available for filtering. Change-Id: I16dae5875096d31d229f864b353c40748b022d2c --- livestatus/src/Makefile.am | 3 +- livestatus/src/ServiceGroupMembersColumn.cc | 102 ++++++++++++++ livestatus/src/ServiceGroupMembersColumn.h | 93 +++++++++++++ livestatus/src/ServiceGroupMembersFilter.cc | 50 +++++++ ...iceListFilter.h => ServiceGroupMembersFilter.h} | 30 ++--- livestatus/src/ServiceListColumn.cc | 150 +++++++++++++-------- livestatus/src/ServiceListColumn.h | 62 +++++---- livestatus/src/ServiceListFilter.cc | 147 -------------------- livestatus/src/TableHosts.cc | 8 +- livestatus/src/TableServiceGroups.cc | 10 +- 10 files changed, 401 insertions(+), 254 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a04ccb94d8…

6 years, 8 months

BI: Started refactoring rendering code

by Lars Michelsen

Module: check_mk Branch: master Commit: 92b0919a92502ebcb2cc938e56a1877367948b81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92b0919a92502e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 17:00:31 2017 +0200 BI: Started refactoring rendering code Change-Id: I0999bed787a4c7f2a39512d99568c3bb6fa2164e --- web/htdocs/bi.py | 99 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 38 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index ece70d7..d4ed8a8 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -2884,31 +2884,74 @@ def render_tree_json(row): def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, lazy): - saved_expansion_level = load_ex_level() - treestate = html.get_tree_states('bi') - if expansion_level != saved_expansion_level: - treestate = {} - html.set_tree_states('bi', treestate) - html.save_tree_states() + tree = FoldableTreeRenderer(row, boxes, omit_root, expansion_level, only_problems, lazy) + return tree.css_class(), tree.render() + + +class FoldableTreeRenderer(object): + def __init__(self, row, boxes, omit_root, expansion_level, only_problems, lazy): + self._row = row + self._boxes = boxes + self._omit_root = omit_root + self._expansion_level = expansion_level + self._only_problems = only_problems + self._lazy = lazy + + + def css_class(self): + return "aggrtree" + ("_box" if self._boxes else "") + + + def render(self): + return html._render_tree() + + def _render_tree(self): + saved_expansion_level = load_ex_level() + treestate = html.get_tree_states('bi') + if self._expansion_level != saved_expansion_level: + treestate = {} + html.set_tree_states('bi', treestate) + html.save_tree_states() + + tree = self._row["aggr_treestate"] + if self._only_problems: + tree = filter_tree_only_problems(tree) + + affected_hosts = self._row["aggr_hosts"] + title = self._row["aggr_tree"]["title"] + group = self._row["aggr_group"] + url_id = html.urlencode_vars([ + ( "group", group ), + ( "title", title ), + ( "omit_root", "yes" if self._omit_root else ""), + ( "boxes", "yes" if self._boxes else ""), + ( "only_problems", "yes" if self._only_problems else ""), + ( "reqhosts", ",".join('%s#%s' % sitehost for sitehost in affected_hosts) ), + ]) + + return '<div id="%s" class=bi_tree_container>' % html.attrencode(url_id) + \ + self._render_subtree(tree, [tree[2]["title"]], len(affected_hosts) > 1) + \ + '</div>' + - def render_subtree(tree, path, show_host): + def _render_subtree(self, tree, path, show_host): is_leaf = len(tree) == 3 path_id = "/".join(path) is_open = treestate.get(path_id) if is_open == None: - is_open = len(path) <= expansion_level + is_open = len(path) <= self._expansion_level # Make sure that in case of BI Boxes (omit root) the root level is *always* visible - if not is_open and omit_root and len(path) == 1: + if not is_open and self._omit_root and len(path) == 1: is_open = True h = "" state = tree[0] - omit_content = lazy and not is_open - mousecode = 'onclick="bi_toggle_%s(this, %d);" ' % ("box" if boxes else "subtree", omit_content) + omit_content = self._lazy and not is_open + mousecode = 'onclick="bi_toggle_%s(this, %d);" ' % ("box" if self._boxes else "subtree", omit_content) # Variant: BI-Boxes - if boxes: + if self._boxes: # Check if we have an assumed state: comparing assumed state (tree[1]) with state (tree[0]) if tree[1] and tree[0] != tree[1]: addclass = " " + _("assumed") @@ -2924,10 +2967,10 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, leaf = "noleaf" mc = mousecode - omit = omit_root and len(path) == 1 + omit = self._omit_root and len(path) == 1 if not omit: h += '<span id="%d:%s" %s class="bibox_box %s %s state state%s%s">' % ( - expansion_level or 0, path_id, mc, leaf, is_open and "open" or "closed", effective_state["state"], addclass) + self._expansion_level or 0, path_id, mc, leaf, is_open and "open" or "closed", effective_state["state"], addclass) if is_leaf: h += aggr_render_leaf(tree, show_host, bare = True) # .replace(" ", " ") else: @@ -2939,14 +2982,14 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, parts = [] for node in tree[3]: new_path = path + [node[2]["title"]] - h += render_subtree(node, new_path, show_host) + h += _render_subtree(node, new_path, show_host) h += '</span>' return h # Variant: foldable trees else: if is_leaf: # leaf - return aggr_render_leaf(tree, show_host, bare = boxes) + return aggr_render_leaf(tree, show_host, bare = self._boxes) h += '<span class=title>' is_empty = len(tree[3]) == 0 @@ -2961,36 +3004,16 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, mousecode=mc, img_class=css_class) if not is_empty: h += '<ul id="%d:%s" class="subtree %s">' % \ - (expansion_level or 0, path_id, css_class) + (self._expansion_level or 0, path_id, css_class) if not omit_content: for node in tree[3]: if not node[2].get("hidden"): new_path = path + [node[2]["title"]] - h += '<li>' + render_subtree(node, new_path, show_host) + '</li>\n' + h += '<li>' + _render_subtree(node, new_path, show_host) + '</li>\n' h += '</ul>' return h + '</span>\n' - tree = row["aggr_treestate"] - if only_problems: - tree = filter_tree_only_problems(tree) - - affected_hosts = row["aggr_hosts"] - title = row["aggr_tree"]["title"] - group = row["aggr_group"] - url_id = html.urlencode_vars([ - ( "group", group ), - ( "title", title ), - ( "omit_root", omit_root and "yes" or ""), - ( "boxes", boxes and "yes" or ""), - ( "only_problems", only_problems and "yes" or ""), - ( "reqhosts", ",".join('%s#%s' % sitehost for sitehost in affected_hosts) ), - ]) - - htmlcode = '<div id="%s" class=bi_tree_container>' % html.attrencode(url_id) + \ - render_subtree(tree, [tree[2]["title"]], len(affected_hosts) > 1) + \ - '</div>' - return "aggrtree" + (boxes and "_box" or ""), htmlcode def aggr_render_node(tree, title, show_host, mousecode=None, img_class=None): # Check if we have an assumed state: comparing assumed state (tree[1]) with state (tree[0])

6 years, 8 months

BI: Moved some more code to new BI tree renderer

by Lars Michelsen

Module: check_mk Branch: master Commit: 8eadef2e13c87ce172685e01fdf939eddf7d98be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eadef2e13c87c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 17:09:17 2017 +0200 BI: Moved some more code to new BI tree renderer Change-Id: I669c6e873e0d0890a3cf5b37b5b68b498fa78fb8 --- web/htdocs/bi.py | 235 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 125 insertions(+), 110 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8eadef2e13…

6 years, 8 months

BI: More rendering code restructuring

by Lars Michelsen

Module: check_mk Branch: master Commit: e926ea14ed36693805fe0ec677d5f4ada77d8b82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e926ea14ed3669… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 17:57:09 2017 +0200 BI: More rendering code restructuring Change-Id: I513bf791cea1dbc255b6d00484776d35868415b8 --- web/htdocs/bi.py | 150 ++++++++++++++++++++++++++++-------------------- web/plugins/views/bi.py | 9 ++- 2 files changed, 94 insertions(+), 65 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e926ea14ed…

6 years, 8 months

BI: Refactored (bottom-up, up-bottom) rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: f406a41f798fdd9b2e69327991989b8b1540bc3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f406a41f798fdd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 30 10:54:14 2017 +0100 BI: Refactored (bottom-up, up-bottom) rendering Change-Id: I0729aa685a9ea300a26fc12ef1c42bfdde28b366 --- web/htdocs/bi.css | 3 +- web/htdocs/bi.py | 120 +++++++++++++++++++++++++++++++------- web/plugins/views/availability.py | 6 +- web/plugins/views/bi.py | 102 ++++++++------------------------ 4 files changed, 130 insertions(+), 101 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f406a41f79…

6 years, 8 months

BI: Separated different tree rendering algorithms

by Lars Michelsen

Module: check_mk Branch: master Commit: f29339288134dfb3bd0d6d2d5a9fbf2f18952165 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f29339288134df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 30 09:48:46 2017 +0100 BI: Separated different tree rendering algorithms Change-Id: Iaec47740ac1677adec6f5f618c1bde53f9115059 --- web/htdocs/bi.py | 265 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 146 insertions(+), 119 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f293392881…

6 years, 8 months

BI: Removed hand crafted HTML from BI rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: 69d072050df3d3b463dcf76795151a8618a4ba7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69d072050df3d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 30 09:06:21 2017 +0100 BI: Removed hand crafted HTML from BI rendering Change-Id: Ib3d9e33ed76ef1fb22f5d34b15797aa0f675e281 --- web/htdocs/bi.css | 1 + web/htdocs/bi.py | 203 ++++++++++++--------- .../images/{assume_0.png => button_assume_0.png} | Bin .../images/{assume_1.png => button_assume_1.png} | Bin .../images/{assume_2.png => button_assume_2.png} | Bin .../images/{assume_3.png => button_assume_3.png} | Bin .../{assume_none.png => button_assume_none.png} | Bin web/htdocs/js/checkmk.js | 57 +++--- 8 files changed, 145 insertions(+), 116 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=69d072050d…

6 years, 8 months

5428 FIX NagVis: Updated to 1.9.4

by Lars Michelsen

Module: check_mk Branch: master Commit: 2cdbf37cb2e6d006d777988af788e785ca75fdd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cdbf37cb2e6d0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 30 08:09:45 2017 +0100 5428 FIX NagVis: Updated to 1.9.4 Change-Id: If44a59f222440fd22f08c278a026aa70e06d6510 --- .werks/5428 | 10 ++++++++++ omd/packages/nagvis/Makefile | 2 +- omd/packages/nagvis/nagvis-1.9.3.tar.gz | Bin 1738427 -> 0 bytes omd/packages/nagvis/nagvis-1.9.4.tar.gz | Bin 0 -> 1788604 bytes 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5428 b/.werks/5428 new file mode 100644 index 0000000..9bf11c7 --- /dev/null +++ b/.werks/5428 @@ -0,0 +1,10 @@ +Title: NagVis: Updated to 1.9.4 +Level: 1 +Component: nagvis +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509347370 +Class: fix + + diff --git a/omd/packages/nagvis/Makefile b/omd/packages/nagvis/Makefile index ddf9d43..4a441dc 100644 --- a/omd/packages/nagvis/Makefile +++ b/omd/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.9.3 +VERSION = 1.9.4 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/omd/packages/nagvis/nagvis-1.9.3.tar.gz b/omd/packages/nagvis/nagvis-1.9.3.tar.gz deleted file mode 100644 index 8d3204a..0000000 Binary files a/omd/packages/nagvis/nagvis-1.9.3.tar.gz and /dev/null differ diff --git a/omd/packages/nagvis/nagvis-1.9.4.tar.gz b/omd/packages/nagvis/nagvis-1.9.4.tar.gz new file mode 100644 index 0000000..fc461a1 Binary files /dev/null and b/omd/packages/nagvis/nagvis-1.9.4.tar.gz differ

6 years, 8 months

Fixed accidentially escaped HTML entity

by Lars Michelsen

Module: check_mk Branch: master Commit: f710500c4e951f2156c7d130cd8b6215ab28169a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f710500c4e951f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 16:32:40 2017 +0200 Fixed accidentially escaped HTML entity Change-Id: Ibb4c7013183b9c200ecfc6b016089e5f28dddce7 --- web/htdocs/bi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index e61cc82..ece70d7 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -3034,7 +3034,7 @@ def aggr_render_node(tree, title, show_host, mousecode=None, img_class=None): output = format_plugin_output(effective_state["output"]) if output: - output = "<b class=bullet>&diams;</b>" + output + output = html.render_b(HTML("&diams;"), class_="bullet") + output else: output = "" h += '<span class="content output">%s</span>\n' % output @@ -3081,7 +3081,7 @@ def aggr_render_leaf(tree, show_host, bare = False): if show_host: content += html.render_a(host.replace(" ", " "), href=host_url) \ - + html.render_b("&diams;", class_="bullet") + + html.render_b(HTML("&diams;"), class_="bullet") if not service: content += html.render_a(_("Host status"), href=host_url)

6 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017