Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1587 SEC Prevent logging of passwords during initial distributed site login

by Lars Michelsen

Module: check_mk Branch: master Commit: b35e2492f520f2f770ec927fc2b153e0549d3533 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b35e2492f520f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 09:11:34 2014 +0100 #1587 SEC Prevent logging of passwords during initial distributed site login When creating a distributed monitoring setup using WATO, after configuring a remote site in the central site, you need to login into the remote site as admin user once to establish a trust between both sites. This login was made using a HTTP get request, which is logged in the access logs of the affected webservers (local system apache, local site apache, remote system apache, remote site apache). All these log entries contain the whole GET query string, which also includes the inserted username and password. This has been fixed by replacing the GET request with a POST request where the request vars are not logged in the access log. --- .werks/1587 | 19 +++++++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 17 +++++++++++------ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.werks/1587 b/.werks/1587 new file mode 100644 index 0000000..7e5fcdd --- /dev/null +++ b/.werks/1587 @@ -0,0 +1,19 @@ +Title: Prevent logging of passwords during initial distributed site login +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417594096 +Class: security + +When creating a distributed monitoring setup using WATO, after configuring +a remote site in the central site, you need to login into the remote site +as admin user once to establish a trust between both sites. + +This login was made using a HTTP get request, which is logged in the access +logs of the affected webservers (local system apache, local site apache, +remote system apache, remote site apache). All these log entries contain the +whole GET query string, which also includes the inserted username and password. + +This has been fixed by replacing the GET request with a POST request where +the request vars are not logged in the access log. diff --git a/ChangeLog b/ChangeLog index b55f0b1..1d16e40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ * 1495 Most WATO tables can now be sorted (where useful)... * 1504 WATO makes host tag and group information available for NagVis... * 1535 Disabled services on service discovery page now link to the ruleset + * 1587 SEC: Prevent logging of passwords during initial distributed site login... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e69ca57..089e6bb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9877,7 +9877,7 @@ def mode_sites(phase): "the initial handshake and not be stored. If the login is " "successful then both side will exchange a login secret " "which is used for the further remote calls.") % site["alias"]) - html.begin_form("login") + html.begin_form("login", method="POST") html.write("<table class=form>") html.write("<tr><td class=legend>%s</td>" % _("Administrator login")) html.write("<td class=content>") @@ -10561,15 +10561,20 @@ def do_site_login(site_id, name, password): # Trying basic auth AND form based auth to ensure the site login works. # Adding _ajaxid makes the web service fail silently with an HTTP code and # not output HTML code for an error screen. - url = site["multisiteurl"] + 'login.py?_login=1' \ - '&_username=%s&_password=%s&_origtarget=automation_login.py&_plain_error=1' % \ - (name, password) - response = get_url(url, site.get('insecure', False), name, password).strip() + url = site["multisiteurl"] + 'login.py' + post_data = html.urlencode_vars([ + ('_login', '1'), + ('_username', name), + ('_password', password), + ('_origtarget', 'automation_login.py'), + ('_plain_error', '1'), + ]) + response = get_url(url, site.get('insecure', False), name, password, post_data=post_data).strip() if '<html>' in response.lower(): message = _("Authentication to web service failed. Message: %s") % \ html.strip_tags(html.strip_scripts(response)) if config.debug: - message += " Automation URL: <tt>%s</tt> " % url + message += " " + _("Automation URL:") + " <tt>%s</tt> " % url raise MKAutomationException(message) elif not response: raise MKAutomationException(_("Empty response from web service"))

9 years, 9 months

Check_MK Git: check_mk: Fix correct datatype of column painters of event console

by Mathias Kettner

Module: check_mk Branch: master Commit: 83544c55783ab7e8c4ded4748b5decc20b979653 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83544c55783ab7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 2 18:51:43 2014 +0100 Fix correct datatype of column painters of event console --- mkeventd/web/plugins/views/mkeventd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index ee02ad2..f30494e 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -317,14 +317,14 @@ if mkeventd_enabled: "title" : _("ID of the event"), "short" : _("ID"), "columns" : ["event_id"], - "paint" : lambda row: ("number", row["event_id"]), + "paint" : lambda row: ("number", str(row["event_id"])), } multisite_painters["event_count"] = { "title" : _("Count (number of recent occurrances)"), "short" : _("Cnt."), "columns" : ["event_count"], - "paint" : lambda row: ("number", row["event_count"]), + "paint" : lambda row: ("number", str(row["event_count"])), } multisite_painters["event_text"] = { @@ -361,7 +361,7 @@ if mkeventd_enabled: try: return "", dict(config.mkeventd_service_levels)[row["event_sl"]] except: - return "", row["event_sl"] + return "", str(row["event_sl"]) multisite_painters["event_sl"] = { "title" : _("Service-Level"),

9 years, 9 months

Check_MK Git: check_mk: #1559 FIX Fix link from BI icon to BI views ( aggregations affected by this host/service)

by Mathias Kettner

Module: check_mk Branch: master Commit: 6cec40a6110c2c620ceab75032a3c0c9330b655d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cec40a6110c2c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 2 18:22:19 2014 +0100 #1559 FIX Fix link from BI icon to BI views (aggregations affected by this host/service) --- .werks/1559 | 9 +++++++++ ChangeLog | 1 + web/htdocs/images/icon_aggr.gif | Bin 3346 -> 0 bytes web/plugins/icons/builtin.py | 19 ++++++++++++++++--- web/plugins/views/builtin.py | 10 ++++++---- web/plugins/visuals/bi.py | 15 ++++++++------- 6 files changed, 40 insertions(+), 14 deletions(-) diff --git a/.werks/1559 b/.werks/1559 new file mode 100644 index 0000000..7354873 --- /dev/null +++ b/.werks/1559 @@ -0,0 +1,9 @@ +Title: Fix link from BI icon to BI views (aggregations affected by this host/service) +Level: 2 +Component: bi +Compatible: compat +Version: 1.2.5i7 +Date: 1417540906 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ada3d38..eb80e5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ BI: * 1435 FIX: Saving BI aggregations: No longer reports 'Request-URI Too Large'... + * 1559 FIX: Fix link from BI icon to BI views (aggregations affected by this host/service) Event Console: * 1169 Added host state type filter to "recent event history" view diff --git a/web/htdocs/images/icon_aggr.gif b/web/htdocs/images/icon_aggr.gif deleted file mode 100644 index ed1c867..0000000 Binary files a/web/htdocs/images/icon_aggr.gif and /dev/null differ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 304598d..dbb013d 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -549,8 +549,21 @@ def paint_aggregations(what, row, tags, custom_vars): if config.bi_precompile_on_demand \ or bi.is_part_of_aggregation(what, row["site"], row["host_name"], row.get("service_description")): - return link_to_view('<img class=icon src="images/icon_aggr.gif" title="%s">' % - _('Aggregations containing this %s') % what, row, 'aggr_' + what) + urivars = [ + ("view_name", "aggr_" + what), + ("aggr_%s_site" % what, row["site"]), + ("aggr_%s_host" % what, row["host_name"]), + ] + if what == "service": + urivars += [ + ( "aggr_service_service", row["service_description"]) + ] + url = html.makeuri_contextless(urivars) + icon = '<img class=icon src="images/icon_aggr.png" title="%s">' \ + % _("BI Aggregations containing this %s") \ + % (what == "host" and _("Host") or _("Service")) + return '<a href="%s">%s</a>' % (url, icon) + multisite_icons.append({ 'paint': paint_aggregations, @@ -603,7 +616,7 @@ def paint_icon_check_bi_aggr(what, row, tags, custom_vars): url = "%s/check_mk/view.py?view_name=aggr_single&aggr_name=%s" % \ (base_url, html.urlencode(aggr_name)) - return '<a href="%s"><img class=icon src="images/icon_aggr.gif" title="%s"></a>' % \ + return '<a href="%s"><img class=icon src="images/icon_aggr.png" title="%s"></a>' % \ (html.attrencode(url), _('Open this Aggregation')) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 3b65e55..e1ac028 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2606,7 +2606,7 @@ multisite_builtin_views.update({ ('bies-1', 'on'), ], 'hidden': True, - 'hide_filters': ["aggr_hosts"], + 'hide_filters': [], 'hidebutton': False, 'icon' : 'aggr', 'layout': 'table', @@ -2625,7 +2625,8 @@ multisite_builtin_views.update({ 'aggr_state', 'aggr_output', 'aggr_assumed_state', - 'aggr_effective_state'], + 'aggr_effective_state', + 'aggr_hosts'], 'sorters': [ ('aggr_name', False) ], 'title': _('Aggregations Affected by Host'), 'topic': _('Business Intelligence')}, @@ -2658,7 +2659,7 @@ multisite_builtin_views.update({ ('bies-1', 'on'), ], 'hidden': True, - 'hide_filters': ["aggr_service"], + 'hide_filters': [], 'hidebutton': False, 'icon' : 'aggr', 'layout': 'table', @@ -2677,7 +2678,8 @@ multisite_builtin_views.update({ 'aggr_state', 'aggr_output', 'aggr_assumed_state', - 'aggr_effective_state'], + 'aggr_effective_state', + 'aggr_service'], 'sorters': [ ('aggr_name', False) ], 'title': _('Aggregations Affected by Service'), 'topic': _('Business Intelligence')}, diff --git a/web/plugins/visuals/bi.py b/web/plugins/visuals/bi.py index be8ba1b..51fa55c 100644 --- a/web/plugins/visuals/bi.py +++ b/web/plugins/visuals/bi.py @@ -95,7 +95,7 @@ declare_filter(121, BITextFilter("output")) class BIHostFilter(Filter): def __init__(self): self.column = "aggr_hosts" - Filter.__init__(self, self.column, _("Affected hosts contain"), "aggr", ["site", "host"], []) + Filter.__init__(self, self.column, _("Affected hosts contain"), "aggr", ["aggr_host_site", "aggr_host_host"], []) def display(self): html.text_input(self.htmlvars[1]) @@ -111,7 +111,7 @@ class BIHostFilter(Filter): # Used for linking def variable_settings(self, row): - return [ ("host", row["host_name"]), ("site", row["site"]) ] + return [ ("aggr_host_host", row["host_name"]), ("aggr_host_site", row["site"]) ] def filter_table(self, rows): val = html.var(self.htmlvars[1]) @@ -123,22 +123,23 @@ declare_filter(130, BIHostFilter(), _("Filter for all aggregations that base on class BIServiceFilter(Filter): def __init__(self): - Filter.__init__(self, "aggr_service", _("Affected by service"), "aggr", ["site", "host", "service"], []) + Filter.__init__(self, "aggr_service", _("Affected by service"), "aggr", ["aggr_service_site", "aggr_service_host", "aggr_service_service"], []) def double_height(self): return True def display(self): html.write(_("Host") + ": ") - html.text_input("host") + html.text_input(self.htmlvars[1]) html.write(_("Service") + ": ") - html.text_input("service") + html.text_input(self.htmlvars[2]) def heading_info(self): - return html.var_utf8("host") + " / " + html.var_utf8("service") + return html.var_utf8(self.htmlvars[1]) + " / " + html.var_utf8(self.htmlvars[2]) def service_spec(self): - return html.var_utf8("site"), html.var_utf8("host"), html.var_utf8("service") + if html.has_var(self.htmlvars[2]): + return html.var_utf8(self.htmlvars[0]), html.var_utf8(self.htmlvars[1]), html.var_utf8(self.htmlvars[2]) # Used for linking def variable_settings(self, row):

9 years, 9 months

Check_MK Git: check_mk: #1586 FIX Dashboard: Toggling edit/

by Lars Michelsen

non-edit is now reflected when reloading the page Message-ID: <547ddbb3.T0djXsg4Y2ypEwN9%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: c38bf9568b2e8545c72bb7593ef00e2f0f68eca7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c38bf9568b2e85… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 16:31:08 2014 +0100 #1586 FIX Dashboard: Toggling edit/non-edit is now reflected when reloading the page --- .werks/1586 | 9 +++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 21 +++++++++++++++------ web/htdocs/js/dashboard.js | 14 ++++++++++---- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/.werks/1586 b/.werks/1586 new file mode 100644 index 0000000..9592963 --- /dev/null +++ b/.werks/1586 @@ -0,0 +1,9 @@ +Title: Dashboard: Toggling edit/non-edit is now reflected when reloading the page +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417534243 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ada3d38..b55f0b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * 1580 FIX: Views: Hardcoded single context filters are not shown in filter form anymore... * 1581 FIX: Single context views with missing context show an error message now... * 1585 FIX: Dashboard: Fixed mass client CPU load consumption when making graph dashlets too small... + * 1586 FIX: Dashboard: Toggling edit/non-edit is now reflected when reloading the page WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index d01f3ef..8d30c7f 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -380,7 +380,13 @@ def render_dashboard(name): refresh = dashlet.get("refresh", dashlet_type.get("refresh")) if refresh: if 'on_refresh' in dashlet_type: - action = 'function() {%s}' % dashlet_type['on_refresh'](nr, dashlet) + try: + action = 'function() {%s}' % dashlet_type['on_refresh'](nr, dashlet) + except Exception, e: + # Ignore the exceptions in non debug mode, assuming the exception also occures + # while dashlet rendering, which is then shown in the dashlet itselfs. + if config.debug: + raise else: # FIXME: remove add_wato_folder_to_url action = '"%s"' % add_wato_folder_to_url(url, wato_folder) # url to dashboard_dashlet.py @@ -398,7 +404,10 @@ def render_dashboard(name): try: on_resize.append('%d: function() {%s}' % (nr, dashlet_type['on_resize'](nr, dashlet))) except Exception, e: - html.write('Error in "on_resize handler": %s' % html.attrencode(e)) + # Ignore the exceptions in non debug mode, assuming the exception also occures + # while dashlet rendering, which is then shown in the dashlet itselfs. + if config.debug: + raise dimensions = { 'x' : dashlet['position'][0], @@ -491,15 +500,15 @@ var refresh_dashlets = [%s]; var on_resize_dashlets = {%s}; var dashboard_name = '%s'; var dashboard_mtime = %d; -var dashboard_url = '%s'; var dashlets = %s; calculate_dashboard(); window.onresize = function () { calculate_dashboard(); } dashboard_scheduler(1); - """ % (MAX, GROW, raster, header_height, screen_margin, title_height, dashlet_padding, dashlet_min_size, - corner_overlap, ','.join(refresh_dashlets), ','.join(on_resize), name, board['mtime'], - html.makeuri([('edit', '1')]), repr(dashlets_js))) + """ % (MAX, GROW, raster, header_height, screen_margin, title_height, + dashlet_padding, dashlet_min_size, corner_overlap, + ','.join(refresh_dashlets), ','.join(on_resize), + name, board['mtime'], repr(dashlets_js))) if mode == 'edit': html.javascript('toggle_dashboard_edit(true)') diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 929c6b8..fcf84ec 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -399,6 +399,14 @@ function toggle_dashboard_edit() { for (var i = 0; i < dashlet_divs.length; i++) dashlet_toggle_edit(dashlet_divs[i]); + // Remove/Add edit=1 parameter from URL to make page reload handling correct + // Only a solution for browsers with history.replaceState support. Sadly + // we have no F5/reload fix for others... + if (window.parent.history.replaceState) { + new_url = makeuri({'edit': g_editing ? '1' : '0'}); + window.parent.history.replaceState({}, document.title, new_url); + } + toggle_grid(); } @@ -527,8 +535,7 @@ function dashlet_toggle_edit(dashlet, edit) { edit.className = 'edit'; edit.onclick = function(dashlet_id, board_name) { return function() { - location.href = 'edit_dashlet.py?name=' + board_name + '&id=' + dashlet_id - + '&back=' + encodeURIComponent(dashboard_url); + location.href = 'edit_dashlet.py?name=' + board_name + '&id=' + dashlet_id; }; }(id, dashboard_name); controls.appendChild(edit); @@ -538,8 +545,7 @@ function dashlet_toggle_edit(dashlet, edit) { del.className = 'del'; del.onclick = function(dashlet_id, board_name) { return function() { - location.href = 'delete_dashlet.py?name=' + board_name + '&id=' + dashlet_id - + '&back=' + encodeURIComponent(dashboard_url); + location.href = 'delete_dashlet.py?name=' + board_name + '&id=' + dashlet_id; }; }(id, dashboard_name); controls.appendChild(del);

9 years, 9 months

Check_MK Git: check_mk: Removed deprecated code

by Lars Michelsen

Module: check_mk Branch: master Commit: dfd609961d3ea0daf02dc8b09dff2f9dd829a604 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfd609961d3ea0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 16:21:45 2014 +0100 Removed deprecated code --- web/htdocs/js/checkmk.js | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index d9209ef..c8321c2 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1172,10 +1172,6 @@ function toggle_row(e, elem) { if(checkbox === null) return; - // When CTRL is not pressed, remove the selection - //if(!e.ctrlKey) - // remove_selected_rows(row_num); - // Is SHIFT pressed? // Yes: // Select all from the last selection @@ -1207,24 +1203,6 @@ function toggle_row(e, elem) { return false; } -// FIXME: If current "row text selection" behavior is ok - remove this -//function disable_selection(e) { -// if(!e) -// e = window.event; -// -// // Skip handling clicks on links/images/... -// var target = getTarget(e); -// if(target.tagName != 'TD') -// return true; -// -// // Firefox handling -// if(typeof target.style.MozUserSelect != 'undefined') -// target.style.MozUserSelect = 'none'; -// -// // All others -// return false; -//} - // Toggles the datarows of the group which the given checkbox is part of. function toggle_group_rows(checkbox) { // 1. Find the first tbody parent @@ -1392,13 +1370,6 @@ function table_init_rowselect(oTable) { elem.onclick = function(e) { return toggle_row(e, this); }; - // Disable selections in IE and then in mozilla - //elem.onselectstart = function(e) { - // return disable_selection(e); - //}; - //elem.onmousedown = function(e) { - // return disable_selection(e); - //}; elem = null; }); }

9 years, 9 months

Check_MK Git: check_mk: Slight update of styling of popup menus

by Mathias Kettner

Module: check_mk Branch: master Commit: 5364f29357e3f19e4e9734c5822f52d417f60503 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5364f29357e3f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 2 15:55:55 2014 +0100 Slight update of styling of popup menus --- web/htdocs/dashboard.css | 17 ++++++------- web/htdocs/dashboard.py | 8 +++--- web/htdocs/js/checkmk.js | 1 + web/htdocs/js/dashboard.js | 2 +- web/htdocs/pages.css | 60 ++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/views.css | 42 ------------------------------- web/htdocs/visuals.py | 4 +-- 7 files changed, 74 insertions(+), 60 deletions(-) diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index 23d3f8c..c34a860 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -208,21 +208,18 @@ div.dashlet_inner div.stats { width: 200px; list-style: none; + color: #fff; background-color: #508AA1; - border: 1px solid #fff; - -moz-box-shadow: 1px 1px 1px 1px #000; - -webkit-box-shadow: 1px 1px 1px 1px #000; - box-shadow: 1px 1px 1px 1px #000; - - /* ie <8 */ - zoom: 1; - filter: progid:DXImageTransform.Microsoft.DropShadow(OffX=2, OffY=2, Color=#000000), - progid:DXImageTransform.Microsoft.Chroma(Color='#ffffff'); + border-width: 1px; + border-style: solid; + border-color: #9bc #367 #367 #9bc; + box-shadow: 0.5px 0.5px 8px #000; + border-radius: 5px; } #controls a { display: block; - padding: 5px 15px; + padding: 1px 15px; text-align: left; text-decoration: none; } diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index d01f3ef..69aa600 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -48,9 +48,8 @@ MAX = -1 # in order to allow the user to customize this. screen_margin = 5 # Distance from the left border of the main-frame to the dashboard area -dashlet_padding = 21, 5, 5, 0, 4 # Margin (N, E, S, W, N w/o title) between outer border of dashlet and its content +dashlet_padding = 21, 5, 5, 0, 0 # Margin (N, E, S, W, N w/o title) between outer border of dashlet and its content corner_overlap = 22 -title_height = 0 # Height of dashlet title-box raster = 10, 10 # Raster the dashlet choords are measured in dashlet_min_size = 10, 10 # Minimum width and height of dashlets @@ -313,7 +312,7 @@ def render_dashboard(name): title = visuals.visual_title('dashboard', board) # Distance from top of the screen to the lower border of the heading - header_height = 60 + header_height = 55 # The title of the dashboard needs to be prefixed with the WATO path, # in order to make it clear to the user, that he is seeing only partial @@ -483,7 +482,6 @@ var GROW = %d; var grid_size = new vec%s; var header_height = %d; var screen_margin = %d; -var title_height = %d; var dashlet_padding = Array%s; var dashlet_min_size = Array%s; var corner_overlap = %d; @@ -497,7 +495,7 @@ var dashlets = %s; calculate_dashboard(); window.onresize = function () { calculate_dashboard(); } dashboard_scheduler(1); - """ % (MAX, GROW, raster, header_height, screen_margin, title_height, dashlet_padding, dashlet_min_size, + """ % (MAX, GROW, raster, header_height, screen_margin, dashlet_padding, dashlet_min_size, corner_overlap, ','.join(refresh_dashlets), ','.join(on_resize), name, board['mtime'], html.makeuri([('edit', '1')]), repr(dashlets_js))) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index d9209ef..7770efc 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2261,6 +2261,7 @@ function toggle_add_to_visual(trigger_obj, element_type, context, params) menu = document.createElement('div'); menu.setAttribute('id', 'visualadd_popup'); + menu.className = "popup_menu"; // populate the menu using a webservice, because the list of dashboards // is not known in the javascript code. But it might have been cached diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 929c6b8..d6dc2f8 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -42,7 +42,7 @@ function size_dashlets() { if (oDash) { has_title = true; //if browser window to small prevent js error - if(d_width <= 20){ + if (d_width <= 20) { d_width = 21; } // 14 => 9 title padding + empty space on right of dashlet diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 3c73d66..2981705 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -892,6 +892,65 @@ div.help tt { color: #000099; } +/*--Popupmenu--------------------------------------------------------------. +| ____ | +| | _ \ ___ _ __ _ _ _ __ _ __ ___ ___ _ __ _ _ | +| | |_) / _ \| '_ \| | | | '_ \| '_ ` _ \ / _ \ '_ \| | | | | +| | __/ (_) | |_) | |_| | |_) | | | | | | __/ | | | |_| | | +| |_| \___/| .__/ \__,_| .__/|_| |_| |_|\___|_| |_|\__,_| | +| |_| |_| | +'-------------------------------------------------------------------------*/ + +.popup_menu { + position: absolute; + bottom: 15px; + left: 15px; + z-index: 10; + + padding: 0; + width: 300px; + + color: #fff; + background-color: #508AA1; + border-width: 1px; + border-style: solid; + border-color: #9bc #367 #367 #9bc; + box-shadow: 0.5px 0.5px 8px #000; + border-radius: 5px; +} + +.popup_menu img { + width: 12px; + height: auto; + vertical-align: bottom; +} + +.popup_menu ul { + list-style: none; + margin: 0; + padding: 0px 5px 5px 10px; +} + +body.main table.footer .popup_menu a, .popup_menu span { + display: block; + padding-top: 1px; + padding-bottom: 1px; + text-align: left; + text-decoration: none; + color: #fff; +} + +.popup_menu span { + padding-left: 0px; + font-weight: bold; + margin-top: 8px; +} + +.popup_menu a:hover { + text-decoration: underline; +} + + /*--Various----------------------------------------------------------------. | __ __ _ | | \ \ / /_ _ _ __(_) ___ _ _ ___ | @@ -933,6 +992,7 @@ div.contextlink.button a { width: 135px; } + /*-------------------------------------------------------------------------. | ____ _ | | | _ \ ___| |__ _ _ __ _ __ ____ _ _ __ ___ | diff --git a/web/htdocs/views.css b/web/htdocs/views.css index ab0406d..822f9a0 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -740,45 +740,3 @@ div.graph a.visualadd:hover { cursor: pointer; } -#visualadd_popup { - position: absolute; - bottom: 15px; - left: 15px; - z-index: 10; - - padding: 0; - width: 200px; - - color: #fff; - background-color: #508AA1; - border: 1px solid #fff; - -moz-box-shadow: 1px 1px 1px 1px #000; - -webkit-box-shadow: 1px 1px 1px 1px #000; - box-shadow: 1px 1px 1px 1px #000; - /* ie <8 */ - zoom: 1; - filter: progid:DXImageTransform.Microsoft.DropShadow(OffX=2, OffY=2, Color=#000000), - progid:DXImageTransform.Microsoft.Chroma(Color='#ffffff'); -} - -#visualadd_popup ul { - list-style: none; - margin: 0; - padding: 5px; -} - -#visualadd_popup a, #visualadd_popup span { - display: block; - padding: 5px 15px; - text-align: left; - text-decoration: none; - color: #fff; -} - -#visualadd_popup span { - padding-left: 5px; -} - -#visualadd_popup a:hover { - text-decoration: underline; -} diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 4dc2342..ca95af8 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1300,8 +1300,8 @@ def ajax_popup_add(): html.write('<li>Add to %s:</li>' % visual_type["title"]) for name, title in handler(): html.write('<li><a href="javascript:void(0)" ' - 'onclick="add_to_visual(\'%s\', \'%s\')">%s</a></li>' % - (visual_type_name, name, title)) + 'onclick="add_to_visual(\'%s\', \'%s\')"><img src="images/icon_%s.png"> %s</a></li>' % + (visual_type_name, name, visual_type_name.rstrip('s'), title)) html.write('</ul>\n')

9 years, 9 months

Check_MK Git: check_mk: #1585 FIX Dashboard: Fixed mass client CPU load consumption when making graph dashlets too small

by Lars Michelsen

Module: check_mk Branch: master Commit: e860032acb15b8a8159da4601842467eddb06a8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e860032acb15b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 15:50:33 2014 +0100 #1585 FIX Dashboard: Fixed mass client CPU load consumption when making graph dashlets too small When PNP graph dashlets were too small, the PNP graph resizing code could get into a situation where continous HTTP requests were made to get a smaller PNP graph where it was not possible to get a smaller one. This resulted in a lot of CPU load by the browser on the client host. --- .bugs/2230 | 7 +++++-- .werks/1585 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/dashboard/dashlets.py | 22 ++++++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) diff --git a/.bugs/2230 b/.bugs/2230 index 8e1be6f..2751767 100644 --- a/.bugs/2230 +++ b/.bugs/2230 @@ -1,9 +1,9 @@ Title: Dashboard javascript goes to 100% CPU if PNP graph cannot be rendered Component: multisite -State: open +Class: bug +State: done Date: 2014-12-01 08:10:12 Targetversion: 1.2.5i1 -Class: bug This happened with the following dashboard in a case where the rightmost PNP graph was not displayabe because the size of the screen was too @@ -358,3 +358,6 @@ small: 'single_infos': [], 'title': u'Main Graph View', 'topic': u'Overview'}} + +2014-12-02 15:47:35: changed state open -> done +Fixed. diff --git a/.werks/1585 b/.werks/1585 new file mode 100644 index 0000000..99881a6 --- /dev/null +++ b/.werks/1585 @@ -0,0 +1,12 @@ +Title: Dashboard: Fixed mass client CPU load consumption when making graph dashlets too small +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417531745 +Class: fix + +When PNP graph dashlets were too small, the PNP graph resizing code could get into +a situation where continous HTTP requests were made to get a smaller PNP graph where +it was not possible to get a smaller one. This resulted in a lot of CPU load by the +browser on the client host. diff --git a/ChangeLog b/ChangeLog index ba88009..682974f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 1578 FIX: Folding states of containers with umlauts in titles are now persisted... * 1580 FIX: Views: Hardcoded single context filters are not shown in filter form anymore... * 1581 FIX: Single context views with missing context show an error message now... + * 1585 FIX: Dashboard: Fixed mass client CPU load consumption when making graph dashlets too small... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 5ed326b..7e8e03c 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -385,6 +385,7 @@ dashlet_types["pnpgraph"] = { var dashlet_offsets = {}; function dashboard_render_pnpgraph(nr, img_url) { + // Get the target size for the graph from the inner dashlet container var inner = document.getElementById('dashlet_inner_' + nr); var c_w = inner.clientWidth; var c_h = inner.clientHeight; @@ -397,6 +398,12 @@ function dashboard_render_pnpgraph(nr, img_url) container.appendChild(img); } + // This handler is called after loading the configured graph image to verify + // it fits into the inner dashlet container. + // One could think that it can simply be solved by requesting an image of the + // given size from PNP/rrdtool, but this is not the case. When we request an + // image of a specified size, this size is used for the graphing area. The + // resulting image has normally labels which are added to the requested size. img.onload = function(nr, url, w, h) { return function() { var i_w = this.clientWidth; @@ -410,14 +417,29 @@ function dashboard_render_pnpgraph(nr, img_url) return; // Finished resizing } + // When the target height is smaller or equal to 81 pixels, PNP + // returns an image which has no labels, just the graph, which has + // exactly the requested height. In this situation no further resizing + // is needed. if (h <= 81 || h - y_diff <= 81) { this.style.width = '100%'; this.style.height = '100%'; return; } + // Save the sizing differences between the requested size and the + // resulting size. This is, in fact, the size of the graph labels. + // load_graph_img() uses these dimensions to try to get an image + // which really fits the requested dimensions. if (typeof dashlet_offsets[nr] == 'undefined') { dashlet_offsets[nr] = [x_diff, y_diff]; + } else if (dashlet_offsets[nr][0] != x_diff || dashlet_offsets[nr][1] != y_diff) { + // was not successful in getting a correctly sized image. Seems + // that PNP/rrdtool was not able to render this size. Terminate + // and automatically scale to 100%/100% + this.style.width = '100%'; + this.style.height = '100%'; + return; } load_graph_img(nr, this, url, w, h);

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #1009, #1068

by Lars Michelsen

Module: check_mk Branch: master Commit: 42c98329294e6873bc6bd52e035ae733e01a0cc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42c98329294e68… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 11:35:38 2014 +0100 Updated bug entries #1009, #1068 --- .bugs/1009 | 7 +++++-- .bugs/1068 | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.bugs/1009 b/.bugs/1009 index 3d80416..515a65d 100644 --- a/.bugs/1009 +++ b/.bugs/1009 @@ -1,9 +1,12 @@ Title: quicksearch: combining host and service search no longer works Component: multisite -State: open +Class: bug +State: works4me Date: 2014-11-05 22:13:21 Targetversion: future -Class: bug a search for services with 's: ' combined with a search for hosts with 'h: ...' always returns ALL hosts with the selected services, not only the selected services on the selected hosts. + +2014-12-02 11:00:33: changed state open -> works4me +Has already been fix. Seems like... diff --git a/.bugs/1068 b/.bugs/1068 index b6792ff..2d37a9c 100644 --- a/.bugs/1068 +++ b/.bugs/1068 @@ -1,9 +1,9 @@ Title: check_mk_exit_status does not work for SNMP based devices Component: checks -State: open +Class: bug +State: works4me Date: 2014-05-06 11:50:46 Targetversion: 1.2.5i1 -Class: bug If you do checks on devices not switched on 24x7, you define a rule "Status of Check_MK Service", which sets check_mk_exit_status @@ -12,3 +12,7 @@ For devices using the Check_MK agent, this works fine. For devices using SNMP it does not work. But also maybe a printer (queried by SNMP) may be switched off during none office hours. + +2014-12-02 11:35:13: changed state open -> works4me +This works at least for connection problems. Needs to be analyzed for +each case individually when it does not work.

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2138, #2141

by Lars Michelsen

Module: check_mk Branch: master Commit: 47ef4e64e068809c69a64de81b0112fb048cdf9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47ef4e64e06880… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 10:59:34 2014 +0100 Updated bug entries #2138, #2141 --- .bugs/2138 | 7 +++++-- .bugs/2141 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/2138 b/.bugs/2138 index 12411a9..6d96289 100644 --- a/.bugs/2138 +++ b/.bugs/2138 @@ -1,12 +1,15 @@ Title: Multisite does handle state, has_been_checked and initial_state wrong Component: multisite -State: open +Class: bug +State: wontfix Date: 2014-07-24 13:10:32 Targetversion: future -Class: bug When a host/service has an initial_state configured and the host/service has never been checked, it is always shown as pending host/service. The initial state is not handled by multisite. Livestatus provides the correct information. + +2014-12-02 10:57:06: changed state open -> wontfix +The feature initial_state is not supported by multisite. diff --git a/.bugs/2141 b/.bugs/2141 index fb8282f..f241a5a 100644 --- a/.bugs/2141 +++ b/.bugs/2141 @@ -1,7 +1,10 @@ Title: Single Host aggregations shows multiple aggregations per definition Component: multisite -State: open +Class: bug +State: works4me Date: 2014-08-05 14:19:51 Targetversion: 1.2.5i1 -Class: bug + +2014-12-02 10:53:13: changed state open -> works4me +Cna not produce a problem here.

9 years, 9 months

Check_MK Git: check_mk: #1582 FIX Fixed missing graphs in mails when sending notifications to non-contacts

by Lars Michelsen

Module: check_mk Branch: master Commit: 7bf1f1cb195feebe1958f2d61f245c1286127a36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bf1f1cb195fee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 11:57:29 2014 +0100 #1582 FIX Fixed missing graphs in mails when sending notifications to non-contacts When sending HTML mails to mail addresses or contacts which are not assigned to a host or service, the graphs were missing in the HTML mails. This has been fixed now. To make it fully working, you need to use the Check_MK Monitoring System builds. --- .bugs/2204 | 7 +++++-- .werks/1582 | 11 +++++++++++ ChangeLog | 1 + notifications/mail | 5 ++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.bugs/2204 b/.bugs/2204 index 9047c86..39483fe 100644 --- a/.bugs/2204 +++ b/.bugs/2204 @@ -1,9 +1,9 @@ Title: Make PNP graphs in notifications user independent Component: core -State: open +Class: bug +State: done Date: 2014-11-18 10:18:50 Targetversion: 1.2.5i1 -Class: bug When using bulk notifications to send mails to a non-contact, the graphs can not be fetched from PNP, because there is no user context. This seems to need a patch @@ -12,3 +12,6 @@ livestatus for permission on the service or host. A possible good fix could be to patch pnp that the permission check is disabled when executed from command line. + +2014-12-02 11:55:17: changed state open -> done +Fixed. diff --git a/.werks/1582 b/.werks/1582 new file mode 100644 index 0000000..68b157a --- /dev/null +++ b/.werks/1582 @@ -0,0 +1,11 @@ +Title: Fixed missing graphs in mails when sending notifications to non-contacts +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i7 +Date: 1417517720 +Class: fix + +When sending HTML mails to mail addresses or contacts which are not assigned to +a host or service, the graphs were missing in the HTML mails. This has been fixed +now. To make it fully working, you need to use the Check_MK Monitoring System builds. diff --git a/ChangeLog b/ChangeLog index 3481d36..ade9e24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,7 @@ * 1512 Bulk notification can now be grouped according to custom macro values... * 1168 FIX: HTML mails can now be configured to display graphs among each other... * 1514 FIX: Try harder to detect previous hard state in notification when using Nagios as core... + * 1582 FIX: Fixed missing graphs in mails when sending notifications to non-contacts... BI: * 1435 FIX: Saving BI aggregations: No longer reports 'Request-URI Too Large'... diff --git a/notifications/mail b/notifications/mail index e77c21b..60ba26c 100755 --- a/notifications/mail +++ b/notifications/mail @@ -380,15 +380,18 @@ def fetch_pnp_data(context, params): # Autodetect the path in OMD environments path = "%s/share/pnp4nagios/htdocs/index.php" % context['OMD_ROOT'] php_save_path = "-d session.save_path=%s/tmp/php/session" % context['OMD_ROOT'] + env = 'REMOTE_USER="check-mk" SKIP_AUTHORIZATION=1' except: # Non-omd environment - use plugin argument 1 path = context.get('PARAMETER_1', '') php_save_path = "" # Using default path + skip_authorization = False + env = 'REMOTE_USER="%s"' % context['CONTACTNAME'] if not os.path.exists(path): raise GraphException('Unable to locate pnp4nagios index.php (%s)' % path) - return os.popen('REMOTE_USER="%s" php %s %s "%s"' % (context['CONTACTNAME'], php_save_path, path, params)).read() + return os.popen('%s php %s %s "%s"' % (env, php_save_path, path, params)).read() def fetch_num_sources(context): svc_desc = context['WHAT'] == 'HOST' and '_HOST_' or context['SERVICEDESC']

9 years, 9 months

← Newer
1
...
44
45
46
47
48
49
50
51
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014