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: 5aa58bb8a7c3cb6db878ad6c6df61d96141f845e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5aa58bb8a7c3cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 10:30:50 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: FIX: fixed outgoing bandwidth in fc port perfometer

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7aa4bb0d1f46450c1be08608467e7fa9c821ccc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aa4bb0d1f4645… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 10:52:53 2012 +0200 FIX: fixed outgoing bandwidth in fc port perfometer --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 28 ++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index dda48f1..7a0f24e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ Multisite: * FIX: remove refresh button from dashboard. * FIX: remove use of old option defaults.checkmk_web_uri + * FIX: fixed outgoing bandwidth in fc port perfometer * New display type 'boxes-omit-root' for BI views * Hostgroup view BI Boxes omits the root level * Finalized layout if view options and commands/filters/painteroptions. diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index b6bda11..9ae4df9 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -211,15 +211,13 @@ perfometers["check_mk-ipmi_sensors"] = perfometer_check_mk_ipmi_sensors perfometers["check_mk-nvidia.temp"] = perfometer_check_mk_ipmi_sensors perfometers["check_mk-cisco_temp_sensor"] = perfometer_check_mk_ipmi_sensors -def perfometer_check_mk_if(row, check_command, perf_data): +def perfometer_bandwidth(in_bytes, out_bytes, in_bw, out_bw): txt = [] have_bw = True h = '<table><tr>' - for name, perf, color in [ - ("in", perf_data[0], "#0e6"), - ("out", perf_data[5], "#2af") ]: - bytes = savefloat(perf[1]) - bw = savefloat(perf[6]) + for name, bytes, bw, color in [ + ("in", in_bytes, in_bw, "#0e6"), + ("out", out_bytes, out_bw, "#2af") ]: if bw > 0.0: rrate = bytes / bw else: @@ -240,8 +238,6 @@ def perfometer_check_mk_if(row, check_command, perf_data): return "   ".join(txt), h # make logarithmic perf-o-meter - in_bytes = savefloat(perf_data[0][1]) - out_bytes = savefloat(perf_data[5][1]) MB = 1000000.0 text = "%s/s   %s/s" % ( number_human_readable(in_bytes), number_human_readable(out_bytes)) @@ -249,6 +245,22 @@ def perfometer_check_mk_if(row, check_command, perf_data): return text, perfometer_logarithmic_dual( in_bytes, "#0e6", out_bytes, "#2af", 1000000, 5) +def perfometer_check_mk_if(row, check_command, perf_data): + return perfometer_bandwidth( + in_bytes = savefloat(perf_data[0][1]), + out_bytes = savefloat(perf_data[5][1]), + in_bw = savefloat(perf_data[0][6]), + out_bw = savefloat(perf_data[5][6]), + ) + +def perfometer_check_mk_brocade_fcport(row, check_command, perf_data): + return perfometer_bandwidth( + in_bytes = savefloat(perf_data[0][1]), + out_bytes = savefloat(perf_data[1][1]), + in_bw = savefloat(perf_data[0][6]), + out_bw = savefloat(perf_data[1][6]), + ) + perfometers["check_mk-if"] = perfometer_check_mk_if perfometers["check_mk-if64"] = perfometer_check_mk_if perfometers["check_mk-if_lancom"] = perfometer_check_mk_if

12 years, 3 months

Check_MK Git: check_mk: FIX: remove use of old option defaults.

by git＠mathias-kettner.de

checkmk_web_uri User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: a176aba0546a3196689c662cf1b1c40c7f7e963c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a176aba0546a31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 10:19:00 2012 +0200 FIX: remove use of old option defaults.checkmk_web_uri --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- web/plugins/icons/builtin.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b8c213..b626626 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Multisite: * FIX: remove refresh button from dashboard. + * FIX: remove use of old option defaults.checkmk_web_uri * New display type 'boxes-omit-root' for BI views * Hostgroup view BI Boxes omits the root level * Finalized layout if view options and commands/filters/painteroptions. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3fa36ab..3ee700c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10419,7 +10419,7 @@ def mode_pattern_editor(phase): master_url = '' if config.is_multisite(): - master_url = '&master_url=' + defaults.checkmk_web_uri + '/' + master_url = '&master_url=' + defaults.url_prefix + 'check_mk/' html.context_button(title, "logwatch.py?host=%s&file=%s%s" % (htmllib.urlencode(hostname), htmllib.urlencode(item), master_url), 'logwatch') diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 3c03b06..df244ef 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -250,7 +250,7 @@ def logwatch_url(sitename, notes_url): master_url = '' if config.is_multisite(): - master_url = '&master_url=' + defaults.checkmk_web_uri + '/' + master_url = '&master_url=' + defaults.url_prefix + 'check_mk/' return site["url_prefix"] + notes_url[i:] + master_url

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: b825c31e2ae379c10b16191dbb3e017d06b7d576 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b825c31e2ae379… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 10:53:35 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: FIX: fix folding in custom links (

by git＠mathias-kettner.de

directories would not open) User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: f7e61635e5f3e9a575fea19197b091a37f80d05a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7e61635e5f3e9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 10:52:00 2012 +0200 FIX: fix folding in custom links (directories would not open) --- ChangeLog | 1 + web/htdocs/js/sidebar.js | 33 --------------------------------- web/plugins/sidebar/shipped.py | 17 ++++------------- 3 files changed, 5 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1bc3e2..2458dd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * Hostgroup view BI Boxes omits the root level * 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) Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index f0496f3..bac4a02 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -664,39 +664,6 @@ function addBookmark() { get_url("add_bookmark.py?title=" + escape(title) + "&href=" + escape(href), updateContents, "snapin_bookmarks"); } -function toggle_folder(o, folderId) { - var par = o.parentNode; - var next = null; - var one_more = false; - var img = null; - - for (var i in par.childNodes) { - var child = par.childNodes[i]; - if (one_more && child.tagName == "DIV") { - next = child; - break; - } - if (child == o) - one_more = true; - } - - for (var i in o.childNodes) { - var child = o.childNodes[i]; - if (child.tagName == "IMG") { - img = child; - break; - } - } - - if (next) - toggle_tree_state('customlinks', folderId, next); - - child = null; - par = null; - next = null; - img = null; -} - /************************************************ * Save/Restore scroll position *************************************************/ diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 06ea8a9..f0f6f46 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1156,20 +1156,11 @@ def render_custom_links(): try: if type(entry[1]) == type(True): idss = ids + [str(n)] - if states.get(''.join(idss), entry[1] and 'on' or 'off') == 'on': # open - display = "display: block; " - img = "link_folder_open.gif" - else: - display = "display: none; " - img = "link_folder.gif" - html.write('<h3 onclick="toggle_folder(this, \'%s\');" ' % ''.join(idss)) - html.write('onmouseover="this.style.cursor=\'pointer\';" ') - html.write('onmouseout="this.style.cursor=\'auto\';">') - html.write('<img src="images/%s" align="center" />' % img) - html.write("%s</h3>\n" % entry[0]) - html.write('<div style="%s" class=sublist>' % display) + is_open = entry[1] + id = '/'.join(idss) + html.begin_foldable_container("customlinks", id, isopen=entry[1], title=entry[0]) render_list(idss, entry[2]) - html.write('</div>\n') + html.end_foldable_container() elif type(entry[1]) == str: frame = len(entry) > 3 and entry[3] or "main" if len(entry) > 2 and entry[2]:

12 years, 3 months

Check_MK Git: check_mk: FIX: remove nasty JS error in sidebar

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d693719ce5a10e2dede27be64d98daf7fb7f6367 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d693719ce5a10e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 10:46:09 2012 +0200 FIX: remove nasty JS error in sidebar --- ChangeLog | 1 + web/htdocs/js/sidebar.js | 18 ++++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbe93ab..e1bc3e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * New display type 'boxes-omit-root' for BI views * Hostgroup view BI Boxes omits the root level * Finalized layout if view options and commands/filters/painteroptions. + * FIX: remove nasty JS error in sidebar Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 1440a8d..f0496f3 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -84,21 +84,19 @@ function registerEdgeListeners(obj) { continue; if (window.addEventListener) - edges[i].addEventListener("mousemove", function(e) { - stopDragScroll(e); - snapinTerminateDrag(e); - return false; - }, false); + edges[i].addEventListener("mousemove", stop_snapin_dragging, false); else - edges[i].onmousemove = function(e) { - stopDragScroll(e); - snapinTerminateDrag(e); - return false; - }; + edges[i].onmousemove = stop_snapin_dragging; } edges = null; } +function stop_snapin_dragging(e) { + stopDragScroll(e); + snapinTerminateDrag(e); + return false; +} + /************************************************ * snapin drag/drop code *************************************************/

12 years, 3 months

Check_MK Git: check_mk: Fixed further problems in mobile GUI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 744585ffdcfc10d8782a8af9afb1c4551a320aa4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=744585ffdcfc10… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 10:34:44 2012 +0200 Fixed further problems in mobile GUI --- ChangeLog | 1 + web/htdocs/check_mk.css | 7 ------- web/htdocs/htmllib.py | 2 +- web/htdocs/mobile.css | 2 ++ web/htdocs/mobile.py | 6 +++--- web/htdocs/pages.css | 18 ++++++++++++++++++ 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d24a82..fbe93ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Mobile: * FIX: Fixed logtime filter settings in all mobile views + * FIX: fix some layout problems BI: * New aggregation function count_ok, that counts the number diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 958bbd9..f27e3fd 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -51,13 +51,6 @@ div { padding: 0; } -h3 { - color: white; - margin-bottom: 2px; - font-size: 12pt; - font-weight: normal; -} - img { border-style: none; } diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 511dca9..13d12c4 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -476,7 +476,7 @@ class html: add_style = "" if "size" in args and args["size"]: addprops += " size=%d" % (args["size"] + 1) - if "width:" not in args.get("style", ""): + if "width:" not in args.get("style", "") and not self.mobile: add_style = "width: %d.5ex; " % args["size"] if "type" in args: diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css index 55aefd5..45e7fb2 100644 --- a/web/htdocs/mobile.css +++ b/web/htdocs/mobile.css @@ -178,6 +178,8 @@ body.mobile table.data td.perfometer td.inner { .ui-li-aside.state { width: 4.5em; text-align: center; + border-radius: 5px; + box-shadow: 0 0 2px #444444; } td.pnpgraph img { diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 87e83af..2c361b2 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -160,8 +160,8 @@ def page_login(): origtarget = html.req.uri html.hidden_field('_origtarget', htmllib.attrencode(origtarget)) - html.text_input("_username", size = 50, label = _("Username:")) - html.password_input("_password", size = 50, label = _("Password:")) + html.text_input("_username", label = _("Username:")) + html.password_input("_password", size=None, label = _("Password:")) html.write("<br>") html.button("_login", _('Login')) html.set_focus("_username") @@ -369,7 +369,7 @@ def do_commands(view, what, rows): count += 1 if command: - html.message(_("Successfully sent %d commands to Nagios.") % count) + html.message(_("Successfully sent %d commands.") % count) return True # Show commands again def show_context_links(context_links): diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 9518ad5..dd0de35 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -30,6 +30,24 @@ Boston, MA 02110-1301 USA. styles are not used in the sidebar and in Mobile. */ /*-------------------------------------------------------------------------. +| ____ _ | +| / ___| ___ _ __ ___ _ __ __ _| | | +| | | _ / _ \ '_ \ / _ \ '__/ _` | | | +| | |_| | __/ | | | __/ | | (_| | | | +| \____|\___|_| |_|\___|_| \__,_|_| | +| | ++--------------------------------------------------------------------------+ +| General styles used in the pages | +'-------------------------------------------------------------------------*/ + +h3 { + color: white; + margin-bottom: 2px; + font-size: 12pt; + font-weight: normal; +} + +/*-------------------------------------------------------------------------. | _ | | _ __ ___ __ _(_)_ __ | | | '_ ` _ \ / _` | | '_ \ |

12 years, 3 months

Check_MK Git: check_mk: Layout fixes for mobile GUI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01badcd858c5181c4371c021bec2eddaeb49a9bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01badcd858c518… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 10:18:08 2012 +0200 Layout fixes for mobile GUI --- web/htdocs/check_mk.css | 31 +++---------------------------- web/htdocs/mobile.css | 14 ++++++++++++++ web/htdocs/pages.css | 30 ++++++++++++++++++++++++++++++ web/plugins/views/filters.py | 11 +++++++---- 4 files changed, 54 insertions(+), 32 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index aa94eb2..958bbd9 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -25,6 +25,9 @@ Boston, MA 02110-1301 USA. */ +/* Global style used by all HTML pages, even by sidebar and + mobile interface */ + /*-------------------------------------------------------------------------. | ____ __ _ _ | | | _ \ ___ / _| __ _ _ _| | |_ ___ | @@ -87,34 +90,6 @@ input, select, textarea { margin-top: 0px; } -input[type=text] { - box-shadow: 0.1px 1.2px 1.8px 0 #888 inset; - position: relative; -} -input[type=password] { - box-shadow: 0.1px 1.2px 1.8px 0 #800 inset; -} -input[type=text],input[type=text] { - height: 18px; - padding: 2px 3px; - vertical-align: middle; -/* top: -2px; */ -} -select { - height: 22px; -} - -input[type=radio] { - margin-left: 0px; -} -input[type=checkbox] { - margin-left: 0px; -} - -select { - padding: 1px 3px; -} - form { margin: 0px; } diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css index 2668776..55aefd5 100644 --- a/web/htdocs/mobile.css +++ b/web/htdocs/mobile.css @@ -108,6 +108,20 @@ body.mobile table.form th { border-style: none; } +body.mobile table.filtertime td { + vertical-align: middle; +} +body.mobile table.filtertime div { +} +body.mobile table.filtertime div.ui-select { + width: auto; +} +body.mobile table.alertstatefilter td { + vertical-align: top; +} +body.mobile table.alertstatefilter .ui-checkbox { + margin: 0; +} /* Perfometers */ diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index c823e5c..9518ad5 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -362,6 +362,36 @@ img.iconbutton.trans { | Input forms (e.g. Filters, Commands, WATO) | '-------------------------------------------------------------------------*/ +input[type=text] { + box-shadow: 0.1px 1.2px 1.8px 0 #888 inset; + position: relative; +} + +input[type=password] { + box-shadow: 0.1px 1.2px 1.8px 0 #800 inset; +} +input[type=text],input[type=text] { + height: 18px; + padding: 2px 3px; + vertical-align: middle; +/* top: -2px; */ +} +select { + height: 22px; +} + +input[type=radio] { + margin-left: 0px; +} +input[type=checkbox] { + margin-left: 0px; +} + +select { + padding: 1px 3px; +} + + h2.formcaption { font-size: 100%; margin-bottom: 0px; diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 6a7fdb1..45a7fc3 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -394,7 +394,7 @@ class FilterTime(Filter): html.write("<tr><td>%s:</td>" % whatname) html.write("<td>") html.text_input(varprefix, style="width: 116px;") - html.write(" ") + html.write("</td><td>") html.select(varprefix + "_range", choices, "3600") html.write("</td></tr>") html.write("</table>") @@ -544,15 +544,18 @@ class FilterLogState(Filter): return True def display(self): - html.write("<table><tr><td>") + html.write("<table class=alertstatefilter><tr><td>") + html.begin_checkbox_group() for varsuffix, what, state, text in self._items: if state == 0: html.write("<u>%s:</u></td><td>" % (_(what.title()))) html.write("  ") - html.checkbox("logst_" + varsuffix, True) - html.write(" " + text + "<br>") + html.checkbox("logst_" + varsuffix, True, label=text) + if not html.mobile: + html.write("<br>") if varsuffix == "h2": html.write("</td><td>") + html.end_checkbox_group() html.write("</td></tr></table>") def filter(self, infoname):

12 years, 3 months

Check_MK Git: check_mk: FIX: Fixed logtime filter settings in all mobile views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9775d4db64f08da38ae575a89af8b6e1e745d737 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9775d4db64f08d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 09:47:14 2012 +0200 FIX: Fixed logtime filter settings in all mobile views --- ChangeLog | 3 ++ web/htdocs/views.py | 2 + web/plugins/views/mobile.py | 76 +++++++++++++++++-------------------------- 3 files changed, 35 insertions(+), 46 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9775d4db64…

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: ee8d3769262fa0f4d5d57ad8b2850a27f4dc51b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee8d3769262fa0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 09:47:19 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

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