Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64271 discussions

Check_MK Git: check_mk: Updated bug entries #0679

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 68851828762c4ccff7c5318d0ccae388d2b37034 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68851828762c4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 15:57:47 2012 +0200 Updated bug entries #0679 --- .bugs/679 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/679 b/.bugs/679 index eb27992..5d809fd 100644 --- a/.bugs/679 +++ b/.bugs/679 @@ -1,4 +1,4 @@ -Title: Logwatch ruleeditor (or ValueSpec ListOf) breaks on older Iceweasel +Title: Logwatch ruleeditor (or ValueSpec ListOf) breaks on Iceweasel on Debian 6.0 Component: multisite State: open Date: 2012-04-24 12:07:14

12 years, 4 months

Check_MK Git: check_mk: Better styling of confirm dialog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d0cb58eb8ad151df0b7b7253d1f5cb8aafec2c06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0cb58eb8ad151… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 18:35:48 2012 +0200 Better styling of confirm dialog --- web/htdocs/pages.css | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index d861b05..01b207b 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -532,3 +532,8 @@ div.really h1, div.success h1, div.error h1, div.message h1, div.warning h1 { margin-left: 0px; } +form.confirm { + margin-top: 8px; + position: relative; + left: -1px; +}

12 years, 4 months

Check_MK Git: check_mk: Cleanup of implementation of spheres

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 918411aac9d0156221485380b73a4ad483b651a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=918411aac9d015… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 16:30:57 2012 +0200 Cleanup of implementation of spheres --- .bugs/684 | 8 ++++++-- web/htdocs/dashboard.py | 37 ++++++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.bugs/684 b/.bugs/684 index 03c489d..d88bc06 100644 --- a/.bugs/684 +++ b/.bugs/684 @@ -1,10 +1,14 @@ Title: Host/Service stastics globe: check scale Component: multisite -State: open +Class: nastiness +State: done Date: 2012-05-09 15:10:19 Targetversion: 1.2.0 -Class: nastiness It seems to me that the sizes of the critical/warning spheres are too large. Checks this out and maybe fix it. + +2012-05-09 16:30:41: changed state open -> done +I've checked this out. The scale is really correct. The human +eye does not realize the exponent here. diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index fa97d32..e4ca77c 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -543,29 +543,36 @@ def render_statistics(pie_id, what, table, filter): r = 0.0 pie_parts = [] if total > 0: - # Counter number of non-zero classes + # Count number of non-empty classes num_nonzero = 0 for info, value in pies: if value > 0: num_nonzero += 1 - # Each non-zero class gets at least a view pixels of visible thickness - separator = 0.05 # 5% of radius - rest_radius = 1 - num_nonzero * separator - - # Make sure, that each class that is not zero has at least a certain - # amount so that it will be visible - totalpart = 1 - # Loop over classes, begin with red (most inner ball) - sum_separator = num_nonzero * separator + # Each non-zero class gets at least a view pixels of visible thickness. + # We reserve that space right now. All computations are done in percent + # of the radius. + separator = 0.02 # 3% of radius + remaining_separatorspace = num_nonzero * separator # space for separators + remaining_radius = 1 - remaining_separatorspace # remaining space + remaining_part = 1.0 # keep track of remaining part, 1.0 = 100% + + # Loop over classes, begin with most outer sphere. Inner spheres show + # worse states and appear larger to the user (which is the reason we + # are doing all this stuff in the first place) for (name, color, viewurl, q), value in pies[::1]: - part = float(value) / total - if value > 0 and totalpart > 0: - radius = sum_separator + rest_radius * totalpart ** (1/3.0) + if value > 0 and remaining_part > 0: # skip empty classes + + # compute radius of this sphere *including all inner spheres!* The first + # sphere always gets a radius of 1.0, of course. + radius = remaining_separatorspace + remaining_radius * (remaining_part ** (1/3.0)) pie_parts.append('chart_pie("%s", %f, %f, %r);' % (pie_id, pie_right_aspect, radius, color)) pie_parts.append('chart_pie("%s", -%f, %f, %r);' % (pie_id, pie_left_aspect, radius, color)) - totalpart -= part - sum_separator -= separator + + # compute relative part of this class + part = float(value) / total # ranges from 0 to 1 + remaining_part -= part + remaining_separatorspace -= separator html.write("</div>")

12 years, 4 months

Check_MK Git: check_mk: WATO: Fix minor problem with replication priority

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0b7fd5cfa4626806fef98dd07886c276700d677d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b7fd5cfa46268… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 10 09:27:44 2012 +0200 WATO: Fix minor problem with replication priority --- web/htdocs/wato.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 573dc9a..48f9052 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6186,6 +6186,7 @@ def mode_sites(phase): + "</th><th>" + _("Timeout") + "</th><th>" + _("Pers.") + "</th><th>" + _("Replication") + + "</th><th>" + _("Prio") + "</th><th>" + _("Login") + "</th></tr>\n") @@ -6238,11 +6239,14 @@ def mode_sites(phase): if site.get("replication") == "slave": repl = _("Slave") elif site.get("replication") == "peer": - repl = _("Peer") + _(" - Priority %s") % site.get("repl_priority",0) + repl = _("Peer") else: - repl = _("Local - Priority %s") % site.get("repl_priority",0) + repl = "" html.write("<td>%s</td>" % repl) + html.write("<td class=number>%s</td>" % + ( site.get("replication") != "slave" and str(site.get("repl_priority", 0)) or "")) + # Login-Button for Replication html.write("<td>") if repl: @@ -6580,7 +6584,8 @@ def mode_edit_site(phase): html.write(" ") html.write("%s %s " % ( _("Peer replication priority"), - _("The replication priority is used to determine the master site from the available peers and local sites. " + _("The replication priority is used to determine the master site " + "from the available peers and local sites. " "The site with the highest number takes precedence."))) html.number_input("repl_priority", site.get("repl_priority", 0), size=2) @@ -7140,7 +7145,7 @@ def get_login_secret(create_on_demand = False): urandom = file("/dev/urandom") while len(secret) < 32: c = urandom.read(1) - if ord(c) >= 33 and ord(c) <= 127: + if ord(c) >= 48 and ord(c) <= 90: secret += c write_settings_file(path, secret) return secret

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a70f9b2f6b4630884878dd352823ebbc315467d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a70f9b2f6b4630… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 10 09:27:47 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: WATO: bugfix in sort_sites(..) function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a0fdccfbe359bd05c1f4b629fb06e0a997bb0e32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0fdccfbe359bd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 9 20:17:59 2012 +0200 WATO: bugfix in sort_sites(..) function --- web/htdocs/wato.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index efdcc1d..a755b71 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6025,7 +6025,7 @@ def find_usage_of_timeperiod(tpname): # Sort given sites argument by peer/local, followed by slaves def sort_sites(sites): def custom_sort(a,b): - if a[1].get("replication","") == b[1].get("replication"): + if a[1].get("replication","peer") == b[1].get("replication","peer"): # Compare by alias if a[1].get("alias") == b[1].get("alias"): return 0 @@ -6033,10 +6033,12 @@ def sort_sites(sites): return 1 else: return -1 - elif a[1].get("replication","") == "slave" and b[1].get("replication") != "slave": + elif a[1].get("replication") == "slave" and b[1].get("replication","peer") != "slave": return 1 - elif a[1].get("replication","") != "slave" and b[1].get("replication") == "slave": + elif a[1].get("replication","peer") != "slave" and b[1].get("replication") == "slave": return -1 + else: + return 0 sites.sort(cmp = custom_sort) def mode_sites(phase):

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0684

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3906dcdc6fac2b9a5e360cd4148800e5ac6f0469 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3906dcdc6fac2b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 15:11:05 2012 +0200 Updated bug entries #0684 --- .bugs/684 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/684 b/.bugs/684 new file mode 100644 index 0000000..03c489d --- /dev/null +++ b/.bugs/684 @@ -0,0 +1,10 @@ +Title: Host/Service stastics globe: check scale +Component: multisite +State: open +Date: 2012-05-09 15:10:19 +Targetversion: 1.2.0 +Class: nastiness + +It seems to me that the sizes of the critical/warning +spheres are too large. Checks this out and maybe fix +it.

12 years, 4 months

Check_MK Git: check_mk: BI: boxed format remembers folding state now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3b06bfc45b27f8c157e732e47a24b8244db35bf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b06bfc45b27f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 11:36:14 2012 +0200 BI: boxed format remembers folding state now --- ChangeLog | 1 + web/htdocs/bi.css | 15 +++++-- web/htdocs/js/bi.js | 26 +++++++----- web/plugins/views/bi.py | 106 +++++++++++++++++++++-------------------------- 4 files changed, 74 insertions(+), 74 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce4084a..176376f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ BI: * FIX: make rotating folding arrows black (white was not visible) * Display format 'boxes' now in all BI views available + * Display format 'boxes' now persists folding state 1.2.0b3: Core: diff --git a/web/htdocs/bi.css b/web/htdocs/bi.css index 7960463..913b079 100644 --- a/web/htdocs/bi.css +++ b/web/htdocs/bi.css @@ -123,15 +123,22 @@ td.aggrtree_box { } .bibox_box { border-width: 1px; + border-color: black; + border-style: solid; margin: 0px 0px 0px 0px; padding: 1px 3px; } -.bibox_box.noleaf { - border: 1px solid black; - box-shadow: 1px 1px 3px #000; +.bibox_box.open.noleaf { + box-shadow: inset 0.5px 0.5px 3px #444; +} +.bibox_box.noleaf:hover { + border-style: dashed; +} +.bibox_box.closed.noleaf { + box-shadow: 0.5px 0.5px 3px #000; } .bibox_box.leaf { - border-style: solid; + border-color: white; } .bibox { padding: 0px; diff --git a/web/htdocs/js/bi.js b/web/htdocs/js/bi.js index 419af9b..345001a 100644 --- a/web/htdocs/js/bi.js +++ b/web/htdocs/js/bi.js @@ -22,7 +22,7 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -function toggle_subtree(oImg) +function bi_toggle_subtree(oImg) { var oSubtree = oImg.parentNode.childNodes[6]; var url = "bi_save_treestate.py?path=" + escape(oSubtree.id); @@ -41,21 +41,24 @@ function toggle_subtree(oImg) get_url(url); } -function toggle_bi_box(oDiv) +function bi_toggle_box(oDiv) { - // oDiv.style.display = "none"; - if (oDiv.style.borderStyle != "dashed") { - oDiv.style.boxShadow = "none"; - oDiv.style.borderStyle = "dashed"; - oDiv.style.BiBoxHidden = true; + var url = "bi_save_treestate.py?path=" + escape(oDiv.id); + + if (oDiv.className.indexOf("open") >= 0) { + oDiv.className = oDiv.className.replace(/open/, "closed"); + url += "&state=closed"; } else { - oDiv.style.boxShadow = "1px 1px 3px #000"; - oDiv.style.borderStyle = "solid"; - oDiv.style.BiBoxHidden = false; + oDiv.className = oDiv.className.replace(/closed/, "open"); + url += "&state=open"; } - // find child nodes that belong to this node + get_url(url); // persist current folding + + // find child nodes that belong to this node and + // control visibility of those. Note: the BI child nodes + // are *no* child nodes in HTML but siblings! var found = 0; for (var i in oDiv.parentNode.childNodes) { var onode = oDiv.parentNode.childNodes[i]; @@ -71,6 +74,7 @@ function toggle_bi_box(oDiv) return; } } + } diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 3b2c4a5..46b83e3 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -275,49 +275,7 @@ def filter_tree_only_problems(tree): return state, assumed_state, node, new_subtrees -def paint_aggr_tree_boxes(row): - mousecode = \ - 'onmouseover="this.style.cursor=\'pointer\';" ' \ - 'onmouseout="this.style.cursor=\'auto\';" ' \ - 'onclick="toggle_bi_box(this);" ' - - def render_subtree(tree, open, show_host, level): - ret = "" - if not open: - state = tree[0] - if len(tree) == 3: - mc = "" - else: - mc = mousecode - if len(tree) == 3: - leaf = " leaf" - else: - leaf = " noleaf" - ret = '' % (mc, leaf, state["state"]) - # ret += ">" * (level-1) - if len(tree) == 3: - ret += aggr_render_leaf(tree, show_host, bare = True) # .replace(" ", " ") - else: - ret += tree[2]["title"].replace(" ", " ") - ret += ' ' - if len(tree) >= 4: - ret += '' % (not open and "display: none;" or "") - parts = [] - for node in tree[3]: - ret += render_subtree(node, False, show_host, level+1) - ret += '' - return ret - - tree = row["aggr_treestate"] - if get_painter_option("aggr_onlyproblems") == "1": - tree = filter_tree_only_problems(tree) - - affected_hosts = row["aggr_hosts"] - htmlcode = render_subtree(tree, True, len(affected_hosts) > 1, 0) - return "aggrtree_box", htmlcode - - -def paint_aggr_tree_foldable(row, boxes=False): +def paint_aggr_tree_foldable(row, boxes): saved_expansion_level = bi.load_ex_level() treestate = weblib.get_tree_states('bi') expansion_level = int(get_painter_option("aggr_expand")) @@ -329,22 +287,52 @@ def paint_aggr_tree_foldable(row, boxes=False): mousecode = \ 'onmouseover="this.style.cursor=\'pointer\';" ' \ 'onmouseout="this.style.cursor=\'auto\';" ' \ - 'onclick="toggle_subtree(this);" ' - + 'onclick="bi_toggle_%s(this);" ' % (boxes and "box" or "subtree") def render_subtree(tree, path, show_host): - if len(tree) == 3: # leaf - return aggr_render_leaf(tree, show_host) - else: - h = '' + 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 + + h = "" + + state = tree[0] + + # Variant: BI-Boxes + if boxes: + if is_leaf: + leaf = "leaf" + mc = "" + else: + leaf = "noleaf" + mc = mousecode - path_id = "/".join(path) - is_open = treestate.get(path_id) - if is_open == None: - is_open = len(path) <= expansion_level + h += '' % ( + expansion_level, path_id, mc, leaf, is_open and "open" or "closed", state["state"]) + if is_leaf: + h += aggr_render_leaf(tree, show_host, bare = True) # .replace(" ", " ") + else: + h += tree[2]["title"].replace(" ", " ") + h += ' ' - is_empty = len(tree[3]) == 0 + if not is_leaf: + h += '' % (not is_open and "display: none;" or "") + parts = [] + for node in tree[3]: + new_path = path + [node[2]["title"]] + h += render_subtree(node, new_path, show_host) + h += '' + return h + + # Variant: foldable trees + else: + if is_leaf: # leaf + return aggr_render_leaf(tree, show_host, bare = boxes) + h += '' + is_empty = len(tree[3]) == 0 if is_empty: style = '' mc = '' @@ -374,7 +362,7 @@ def paint_aggr_tree_foldable(row, boxes=False): affected_hosts = row["aggr_hosts"] htmlcode = render_subtree(tree, [tree[2]["title"]], len(affected_hosts) > 1) - return "aggrtree", htmlcode + return "aggrtree" + (boxes and "_box" or ""), htmlcode def paint_aggr_tree_ltr(row, mirror): @@ -433,13 +421,13 @@ def paint_aggr_tree_ltr(row, mirror): def paint_aggregated_tree_state(row): treetype = get_painter_option("aggr_treetype") if treetype == "foldable": - return paint_aggr_tree_foldable(row) + return paint_aggr_tree_foldable(row, boxes = False) + elif treetype == "boxes": + return paint_aggr_tree_foldable(row, boxes = True) elif treetype == "bottom-up": return paint_aggr_tree_ltr(row, False) elif treetype == "top-down": return paint_aggr_tree_ltr(row, True) - elif treetype == "boxes": - return paint_aggr_tree_boxes(row) multisite_painters["aggr_treestate"] = { "title" : _("Aggregation: complete tree"), @@ -453,7 +441,7 @@ multisite_painters["aggr_treestate_boxed"] = { "title" : _("Aggregation: simplistic boxed layout"), "short" : _("Tree"), "columns" : [ "aggr_treestate", "aggr_hosts" ], - "paint" : paint_aggr_tree_boxes, + "paint" : lambda row: paint_aggr_tree_foldable(row, boxes=True), } # _____ _ _ _

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 280ea96a6cb4778f8e9ff24b606d4daaa80336a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=280ea96a6cb477… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 10:38:42 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: BI: make display format boxes available in all views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a851f71701b7406e1210144fd8e2356bdeaf56ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a851f71701b740… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 10:38:39 2012 +0200 BI: make display format boxes available in all views --- ChangeLog | 1 + web/plugins/views/bi.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79d7100..ce4084a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ BI: * FIX: make rotating folding arrows black (white was not visible) + * Display format 'boxes' now in all BI views available 1.2.0b3: Core: diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 1475d34..3b2c4a5 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -154,9 +154,10 @@ multisite_painter_options["aggr_treetype"] = { "title" : _("Type of tree layout"), "default" : "foldable", "values" : [ - ("foldable", "foldable"), - ("bottom-up", "bottom up"), - ("top-down", "top down")] + ("foldable", _("foldable")), + ("boxes", _("boxes")), + ("bottom-up", _("bottom up")), + ("top-down", _("top down"))] } multisite_painter_options["aggr_wrap"] = { @@ -437,6 +438,8 @@ def paint_aggregated_tree_state(row): return paint_aggr_tree_ltr(row, False) elif treetype == "top-down": return paint_aggr_tree_ltr(row, True) + elif treetype == "boxes": + return paint_aggr_tree_boxes(row) multisite_painters["aggr_treestate"] = { "title" : _("Aggregation: complete tree"),

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits