Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6f52226bbd770aeb10de6734072aad41d4a2b3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6f52226bbd770… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 11:16:18 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6cd335cb2a7b9d7f773c4ebdb31228d32d7ea489 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cd335cb2a7b9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 12:36:03 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: FIX: disable checkbox button in non-checkboxable layouts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 528090806148e901ff6d4705b42578b66471963d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=528090806148e9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 11:37:39 2012 +0200 FIX: disable checkbox button in non-checkboxable layouts --- ChangeLog | 1 + web/htdocs/views.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88ee342..efa0f20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * FIX: Logwatch: Changed font color back to black * FIX: show toggle button for checkboxes in deactivated state * FIX: fix repeated stacked refresh when toggling columns + * FIX: disable checkbox button in non-checkboxable layouts Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 0f42cbf..13fc8c0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1301,7 +1301,8 @@ def render_view(view, rows, datasource, group_painters, painters, len(rows) > 0 and \ should_show_command_form(display_options, datasource) - show_context_links(view, hide_filters, show_filters, display_options, painter_options, command_form) + show_context_links(view, hide_filters, show_filters, display_options, + painter_options, command_form, show_checkboxes) # User errors in filters html.show_user_errors() @@ -1580,7 +1581,8 @@ def togglebutton(id, isopen, icon, help): html.write('<div class="togglebutton %s %s" title="%s" ' 'onclick="view_toggle_form(this, \'%s\');"></div>' % (icon, cssclass, help, id)) -def show_context_links(thisview, active_filters, show_filters, display_options, painter_options, command_form): +def show_context_links(thisview, active_filters, show_filters, display_options, + painter_options, command_form, show_checkboxes): # html.begin_context_buttons() called automatically by html.context_button() # That way if no button is painted we avoid the empty container execute_hooks('buttons-begin') @@ -1607,7 +1609,10 @@ def show_context_links(thisview, active_filters, show_filters, display_options, if 'C' in display_options: if command_form: togglebutton("commands", False, "commands", _("Execute commands on hosts, services and other objects")) - view_option_toggler(thisview, "show_checkboxes", "checkbox", _("Enable/Disable checkboxes for selecting rows for commands")) + if show_checkboxes: + view_option_toggler(thisview, "show_checkboxes", "checkbox", _("Enable/Disable checkboxes for selecting rows for commands")) + else: + togglebutton_off("checkbox") else: togglebutton_off("commands") togglebutton_off("checkbox")

12 years, 3 months

Check_MK Git: check_mk: FIX: fixed box layout with omitted root ( was sometimes invisible)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 99fa018839fb16af02f795a9b32700703fee40d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99fa018839fb16… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 11:33:48 2012 +0200 FIX: fixed box layout with omitted root (was sometimes invisible) --- ChangeLog | 1 + web/plugins/views/bi.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b7a508..88ee342 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * New aggregation function count_ok, that counts the number of nodes in state OK. * FIX: Removed debug output int count_ok aggregation + * FIX: fixed box layout with omitted root (was sometimes invisible) Checks & Agents: * AIX: convert NIC check to lnx_if (now being compatible with if/if64) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 12e3738..02070d7 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -310,7 +310,8 @@ def paint_aggr_tree_foldable(row, boxes, omit_root=True): leaf = "noleaf" mc = mousecode - if not omit_root or len(path) > 1: + omit = omit_root and len(path) == 1 + if not omit: h += '<span id="%d:%s" %s class="bibox_box %s %s state%s">' % ( expansion_level, path_id, mc, leaf, is_open and "open" or "closed", state["state"]) if is_leaf: @@ -320,7 +321,7 @@ def paint_aggr_tree_foldable(row, boxes, omit_root=True): h += '</span> ' if not is_leaf: - h += '<span class="bibox" style="%s">' % (not is_open and "display: none;" or "") + h += '<span class="bibox" style="%s">' % ((not is_open and not omit) and "display: none;" or "") parts = [] for node in tree[3]: new_path = path + [node[2]["title"]]

12 years, 3 months

Check_MK Git: check_mk: FIX: fix repeated stacked refresh when toggling columns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 15cc9048a811700580fdf5f16598b517f825a0e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15cc9048a81170… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 11:24:19 2012 +0200 FIX: fix repeated stacked refresh when toggling columns --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e82da7..6b7a508 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * FIX: animation of rotation treeangle in trees works again * FIX: Logwatch: Changed font color back to black * FIX: show toggle button for checkboxes in deactivated state + * FIX: fix repeated stacked refresh when toggling columns Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 47fc4e4..a30c98c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -659,9 +659,10 @@ function setReload(secs, url) { } function startReloadTimer(url) { - if(gReloadTimer) + if (gReloadTimer) clearTimeout(gReloadTimer); - gReloadTimer = setTimeout("handleReload('" + url + "')", Math.ceil(parseFloat(gReloadTime) * 1000)); + if (gReloadTime) + gReloadTimer = setTimeout("handleReload('" + url + "')", Math.ceil(parseFloat(gReloadTime) * 1000)); } function updateHeaderTime() { @@ -719,17 +720,18 @@ function handleReload(url) { // FiXME: Nicht mehr die ganze Seite neu laden, wenn es ein DIV "data_container" gibt. // In dem Fall wird die aktuelle URL aus "window.location.href" geholt, für den Refresh // modifiziert, der Inhalt neu geholt und in das DIV geschrieben. - if(!document.getElementById('data_container') || url !== '') { + if (!document.getElementById('data_container') || url !== '') { if (url === '') window.location.reload(false); else window.location.href = url; - } else { + } + else { // Enforce specific display_options to get only the content data var display_options = getUrlParam('display_options'); var opts = [ 'h', 't', 'b', 'f', 'c', 'o', 'd', 'e', 'r', 'w' ]; - for(var i = 0; i < opts.length; i++) { - if(display_options.indexOf(opts[i].toUpperCase()) > -1) + for (var i = 0; i < opts.length; i++) { + if (display_options.indexOf(opts[i].toUpperCase()) > -1) display_options = display_options.replace(opts[i].toUpperCase(), opts[i]); else display_options += opts[i];

12 years, 3 months

Check_MK Git: check_mk: Removed debug output int count_ok aggregation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9651e779731f5aad7f0d614fb6169f5ec44a6abd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9651e779731f5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 11:16:35 2012 +0200 Removed debug output int count_ok aggregation --- ChangeLog | 1 + web/htdocs/bi.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c982b92..9e82da7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ BI: * New aggregation function count_ok, that counts the number of nodes in state OK. + * FIX: Removed debug output int count_ok aggregation Checks & Agents: * AIX: convert NIC check to lnx_if (now being compatible with if/if64) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 6d19aa2..5e04325 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -876,7 +876,7 @@ def aggr_countok(nodes, needed_for_ok=2, needed_for_warn=1): elif num_ok >= int(needed_for_warn): return { "state" : 1, "output" : "" } else: - return { "state" : 2, "output" : "%r / %d" % (states, num_ok) } + return { "state" : 2, "output" : "" } config.aggregation_functions["count_ok"] = aggr_countok

12 years, 3 months

Check_MK Git: check_mk: FIX: show toggle button for checkboxes in deactivated state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e52a559ace1209d7ce9a5ecfa50ad8cf730f066d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e52a559ace1209… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 11:12:30 2012 +0200 FIX: show toggle button for checkboxes in deactivated state --- ChangeLog | 1 + web/htdocs/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a67688..c982b92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * FIX: fix folding in custom links (directories would not open) * FIX: animation of rotation treeangle in trees works again * FIX: Logwatch: Changed font color back to black + * FIX: show toggle button for checkboxes in deactivated state Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/views.py b/web/htdocs/views.py index fc4856a..0f42cbf 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1610,7 +1610,7 @@ def show_context_links(thisview, active_filters, show_filters, display_options, view_option_toggler(thisview, "show_checkboxes", "checkbox", _("Enable/Disable checkboxes for selecting rows for commands")) else: togglebutton_off("commands") - togglebutton_off("checkboxes") + togglebutton_off("checkbox") if 'O' in display_options: if config.may("view_option_columns"):

12 years, 3 months

Check_MK Git: check_mk: FIX: animation of rotation treeangle in trees works again

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c984c4bb211c5366746f81bb0139a0af068d5c3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c984c4bb211c53… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 11:08:08 2012 +0200 FIX: animation of rotation treeangle in trees works again --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7405610..5522853 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Finalized layout if view options and commands/filters/painteroptions. * FIX: remove nasty JS error in sidebar * FIX: fix folding in custom links (directories would not open) + * FIX: animation of rotation treeangle in trees works again Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 7f7f2ea..47fc4e4 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -860,7 +860,7 @@ function toggle_foldable_container(treename, id) { var oImg = document.getElementById('treeimg.' + treename + '.' + id); var oBox = document.getElementById('tree.' + treename + '.' + id); toggle_tree_state(treename, id, oBox); - toggle_folding(oImg, oBox.style.display != "none"); + toggle_folding(oImg, !has_class(oBox, "closed")); oImg = null; oBox = null; }

12 years, 3 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: 20b4e3e20154914f656306a772d77d949bb0bafd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20b4e3e2015491… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 11:10:29 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 3 months

Check_MK Git: check_mk: FIX: Logwatch: Changed font color back to black

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 852b1cb90f3b1a685c7ce090b41a4da2ea14c40f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=852b1cb90f3b1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 11:06:14 2012 +0200 FIX: Logwatch: Changed font color back to black --- ChangeLog | 1 + web/htdocs/logwatch.css | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7405610..78d00f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Finalized layout if view options and commands/filters/painteroptions. * FIX: remove nasty JS error in sidebar * FIX: fix folding in custom links (directories would not open) + * FIX: Logwatch: Changed font color back to black Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/logwatch.css b/web/htdocs/logwatch.css index 78831e5..3f08f42 100644 --- a/web/htdocs/logwatch.css +++ b/web/htdocs/logwatch.css @@ -29,6 +29,7 @@ Boston, MA 02110-1301 USA. #logwatch { margin-top: 1ex; + color: #000; } #logwatch div.chunk {

12 years, 3 months

← Newer
1
...
15
16
17
18
19
20
21
...
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