Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

Check_MK Git: check_mk: WATO: site configuration, new attriute replication priority

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7dad0356fbe1769e8d48b496b4c09a9204a50417 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dad0356fbe176… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 8 19:19:14 2012 +0200 WATO: site configuration, new attriute replication priority --- web/htdocs/wato.py | 69 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 49 insertions(+), 20 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 78e73ed..efdcc1d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3322,7 +3322,7 @@ def mode_changelog(phase): html.write("<h3>%s</h3>" % _("Distributed WATO - replication status")) repstatus = load_replication_status() sites = config.allsites().items() - sites.sort(cmp = lambda a,b: cmp(a[1].get("alias",a[0]), b[1].get("alias", b[0]))) + sort_sites(sites) html.write("<table class=data>") html.write("<tr class=dualheader>") html.write("<th rowspan=2>%s</th>" % _("ID") + @@ -6022,6 +6022,23 @@ def find_usage_of_timeperiod(tpname): # | Mode for managing sites. | # '----------------------------------------------------------------------' +# 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"): + # Compare by alias + if a[1].get("alias") == b[1].get("alias"): + return 0 + elif a[1].get("alias") > b[1].get("alias"): + return 1 + else: + return -1 + elif a[1].get("replication","") == "slave" and b[1].get("replication") != "slave": + return 1 + elif a[1].get("replication","") != "slave" and b[1].get("replication") == "slave": + return -1 + sites.sort(cmp = custom_sort) + def mode_sites(phase): if phase == "title": return _("Multisite connections") @@ -6172,7 +6189,7 @@ def mode_sites(phase): odd = "even" entries = sites.items() - entries.sort(cmp = lambda a, b: cmp(a[1].get("alias"), b[1].get("alias"))) + sort_sites(entries) for id, site in entries: odd = odd == "odd" and "even" or "odd" html.write('<tr class="data %s0">' % odd) @@ -6219,9 +6236,9 @@ def mode_sites(phase): if site.get("replication") == "slave": repl = _("Slave") elif site.get("replication") == "peer": - repl = _("Peer") + repl = _("Peer") + _(" - Priority %s") % site.get("repl_priority",0) else: - repl = "" + repl = _("Local - Priority %s") % site.get("repl_priority",0) html.write("<td>%s</td>" % repl) # Login-Button for Replication @@ -6351,6 +6368,14 @@ def mode_edit_site(phase): repl = None if repl: new_site["replication"] = repl + + # Replication Priority + if not repl or repl != "slave": + try: + new_site["repl_priority"] = int(html.var("repl_priority", 0)) + except: + raise MKUserError("repl_priority", _("Replication Priority '%s' is not a valid number.") % html.var("repl_priority","")) + multisiteurl = html.var("multisiteurl", "").strip() if repl: if not multisiteurl: @@ -6549,6 +6574,14 @@ def mode_edit_site(phase): html.radiobutton("replication", "peer", site.get("replication") == "peer", _("Peer: synchronize configuration with this site")) html.write(" ") html.radiobutton("replication", "slave", site.get("replication") == "slave", _("Slave: push configuration to this site")) + + 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 site with the highest number takes precedence."))) + html.number_input("repl_priority", site.get("repl_priority", 0), size=2) + html.write(" ") html.write("%s %s " % ( _("Multisite-URL of remote site upto and including <tt>/check_mk/</tt>"), @@ -7007,27 +7040,21 @@ def preferred_peer(): local_site = None best_peer = None best_working_peer = None + for site_id, site in config.allsites().items(): if site.get("replication") == "slave": continue # Ignore slave sites - if site_is_local(site_id): - if best_peer == None or site_id < best_peer["id"]: - best_peer = site - if best_working_peer == None or site_id < best_working_peer["id"]: - best_working_peer = site - local_site = site - - # Is the a member of the peer group? - elif site.get("replication") == "peer": - if best_peer == None or site_id < best_peer["id"]: - best_peer = site - - ss = html.site_status.get(site_id, {}) - status = ss.get("state", "unknown") - if status == "online" and ( - best_working_peer == None or site_id < best_working_peer): + if best_peer == None or site.get("repl_priority",0) > best_peer.get("repl_priority",0) or (site_id < best_peer["id"] and site.get("repl_priority",0) == best_peer.get("repl_priority",0)): + best_peer = site + if site_is_local(site_id): best_working_peer = site + local_site = site + else: + ss = html.site_status.get(site_id, {}) + status = ss.get("state", "unknown") + if status == "online": + best_working_peer = site if best_working_peer: # Good if best_working_peer == local_site: @@ -7040,6 +7067,8 @@ def preferred_peer(): return None # no peer, not even a local site... + + def do_peer_redirect(peer): if is_distributed(): current_mode = html.var("mode") or "main"

12 years, 1 month

Check_MK Git: check_mk: FIX: fix missing variable curdir in lib.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4f73851aba9cfe2cd68f88fe7e7afffee08e262 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4f73851aba9cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 18:52:45 2012 +0200 FIX: fix missing variable curdir in lib.py --- web/htdocs/lib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index f59c3b3..fa5a58f 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -88,7 +88,7 @@ def make_nagios_directories(name): # be happy if someone already created the path if e.errno != errno.EEXIST: raise - if tail == curdir: # xxx/newdir/. exists if xxx/newdir exists + if tail == ".": # xxx/newdir/. exists if xxx/newdir exists return make_nagios_directory(name)

12 years, 1 month

Check_MK Git: check_mk: Fix styling of main menu

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 746f7af85d7dd88133a4814d096965006f916463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=746f7af85d7dd8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 18:47:24 2012 +0200 Fix styling of main menu --- web/htdocs/wato.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 271cdf0..25fab38 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -662,6 +662,7 @@ form#form_timeperiod td.vlof_content { position: relative; margin: 0px -1px -1px 0px; left: -2px; + text-decoration: none; } .wato div.mainmenu a:hover { background-image: url("images/wato_mainmenu_button_hi.png");

12 years, 1 month

Check_MK Git: check_mk: Minor layout fix

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ec09e9a4c2068c774a0de698b58d7ef5467d3161 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec09e9a4c2068c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 16:51:20 2012 +0200 Minor layout fix --- web/htdocs/wato.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index a9377cf..271cdf0 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -787,7 +787,7 @@ div.varname { overflow: hidden; } .wato .globalvars td.left { - width: 345px; + width: 339px; overflow: hidden; white-space: nowrap; }

12 years, 1 month

Check_MK Git: check_mk: WATO: new layout of global settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: da1e20462cff76016e228481832319f2fd04cf72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da1e20462cff76… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 16:50:09 2012 +0200 WATO: new layout of global settings --- ChangeLog | 1 + .../images/button_snapin_greyswitch_off_hi.png | Bin 0 -> 1080 bytes .../images/button_snapin_greyswitch_off_lo.png | Bin 0 -> 998 bytes .../images/button_snapin_greyswitch_on_hi.png | Bin 0 -> 1134 bytes .../images/button_snapin_greyswitch_on_lo.png | Bin 0 -> 1147 bytes web/htdocs/wato.css | 37 +++++++ web/htdocs/wato.py | 99 +++++++++++--------- 7 files changed, 92 insertions(+), 45 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=da1e20462c…

12 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012