Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1687 FIX Add visual to dashboard menu can now be closed with click anywhere on page

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c5c3ab75a8986bcda0d1851945d8c3af7af3700 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c5c3ab75a8986… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 17:57:29 2014 +0100 #1687 FIX Add visual to dashboard menu can now be closed with click anywhere on page --- .werks/1687 | 9 +++++ ChangeLog | 1 + web/htdocs/htmllib.py | 5 +-- web/htdocs/js/checkmk.js | 87 +++++++++++++++++++++++++++++++++++++++------- web/htdocs/pages.css | 31 +++++++++++++++-- web/htdocs/views.css | 26 -------------- 6 files changed, 116 insertions(+), 43 deletions(-) diff --git a/.werks/1687 b/.werks/1687 new file mode 100644 index 0000000..e7a8e15 --- /dev/null +++ b/.werks/1687 @@ -0,0 +1,9 @@ +Title: Add visual to dashboard menu can now be closed with click anywhere on page +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417798625 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ec0fc2a..9ae8b6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -177,6 +177,7 @@ * 1678 FIX: Fixed problem with garbled styles on user profile page after saving * 1680 FIX: Fixed various dashlet designer position/resizing issues... * 1683 FIX: Replaced a lot of old GIF images with better looking PNG images + * 1687 FIX: Add visual to dashboard menu can now be closed with click anywhere on page WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index af869fb..9d7740a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -883,10 +883,11 @@ class html: if self.myfile == "view": mode_name = self.var('mode') == "availability" and "availability" or "view" + encoded_vars = self.attrencode([ (k, v != None and v or '') for k,v in self.page_context.items() ]) h += '<div class="visualadd"><a class="visualadd" href="javascript:void(0)" ' \ - 'onclick="toggle_add_to_visual(this, \'%s\', %s, {\'name\': \'%s\'})">' \ + 'onclick="toggle_add_to_visual(event, this, \'%s\', %s, {\'name\': \'%s\'})">' \ '<img class=statusicon src="images/status_add_dashlet.png" title="%s"></a></div>\n' % \ - (mode_name, self.attrencode(self.page_context), self.var('view_name'), _("Add this view to...")) + (mode_name, encoded_vars, self.var('view_name'), _("Add this view to...")) for img, tooltip in self.status_icons.items(): if type(tooltip) == tuple: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 04987ef..163dda4 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -156,6 +156,21 @@ function add_event_handler(type, func) { } } +function del_event_handler(type, func) { + if (window.removeEventListener) { + // W3 stadnard browsers + window.removeEventListener(type, func, false); + } + else if (window.detachEvent) { + // IE<9 + document.documentElement.detachEvent("on"+type, func); + } + else { + window["on" + type] = null; + } +} + + function prevent_default_events(event) { if (event.preventDefault) event.preventDefault(); @@ -561,8 +576,8 @@ function create_graph(data, params) { visualadd.title = 'Add to dashboard'; visualadd.setAttribute('class', 'visualadd'); visualadd.onclick = function(host, service, view, source) { - return function() { - toggle_add_to_visual(this, 'pnpgraph', + return function(event) { + toggle_add_to_visual(event, this, 'pnpgraph', { 'host': host, 'service': service }, { 'timerange': view, 'source': source } ); @@ -946,6 +961,8 @@ function folding_step(oImg, state, step) { /* Check if an element has a certain css class. */ function has_class(o, cn) { + if (typeof(o.className) === 'undefined') + return false; var parts = o.className.split(' '); for (x=0; x<parts.length; x++) { if (parts[x] == cn) @@ -2197,9 +2214,9 @@ function toggle_popup(event, id) // Add to Visual -var add_visual_data = null; -var visualadd_popup_id = null; -var visualadd_popup_content = null; +var add_visual_data = null; +var visualadd_popup_id = null; +var visualadd_popup_contents = {}; function close_visualadd_popup() { @@ -2209,10 +2226,31 @@ function close_visualadd_popup() menu.parentNode.removeChild(menu); menu = null; } + visualadd_popup_id = null; } -function toggle_add_to_visual(trigger_obj, element_type, context, params) +// Registerd as click handler on the page while the visualadd menu is opened +// This is used to close the menu when the user clicks elsewhere +function handle_visualadd_close(event) { + var target = getTarget(event); + + // Check whether or not a parent of the clicked node is the popup menu + while (target && target.id != 'visualadd_popup' && !has_class(target, 'statusicon')) { + target = target.parentNode; + } + + if (target) { + return true; // clicked menu or statusicon + } + + close_visualadd_popup(); + del_event_handler('click', handle_visualadd_close); +} + +function toggle_add_to_visual(event, trigger_obj, element_type, context, params) { + if(!event) + event = window.event; var container = trigger_obj.parentNode; var ident; for (var i in container.parentNode.childNodes) { @@ -2230,6 +2268,8 @@ function toggle_add_to_visual(trigger_obj, element_type, context, params) } visualadd_popup_id = ident; + add_event_handler('click', handle_visualadd_close); + menu = document.createElement('div'); menu.setAttribute('id', 'visualadd_popup'); menu.className = "popup_menu"; @@ -2237,22 +2277,43 @@ function toggle_add_to_visual(trigger_obj, element_type, context, params) // populate the menu using a webservice, because the list of dashboards // is not known in the javascript code. But it might have been cached // before. In this case do not perform a second request. - if (visualadd_popup_content !== null) - menu.innerHTML = visualadd_popup_content; + if (ident in visualadd_popup_contents) + menu.innerHTML = visualadd_popup_contents[ident]; else - get_url('ajax_popup_add_visual.py', add_dashboard_response_handler); + get_url('ajax_popup_add_visual.py', add_dashboard_response_handler, [ident, event]); add_visual_data = [ element_type, context, params ]; container.appendChild(menu); + fix_visualadd_menu_position(event, menu); } function add_dashboard_response_handler(data, response_text) { - visualadd_popup_content = response_text; - var popup = document.getElementById('visualadd_popup'); - if (popup) { - popup.innerHTML = response_text; + var ident = data[0]; + var event = data[1]; + visualadd_popup_contents[ident] = response_text; + var menu = document.getElementById('visualadd_popup'); + if (menu) { + menu.innerHTML = response_text; + fix_visualadd_menu_position(event, menu); + } +} + +function fix_visualadd_menu_position(event, menu) { + var target = getTarget(event); + var dashboard = document.getElementById('dashboard'); + + // When menu is out of screen on the right, move to left + if (menu.offsetLeft + menu.clientWidth > pageWidth()) { + menu.style.left = (menu.offsetLeft - menu.clientWidth - 15) + 'px'; + menu.style.right = 'auto'; + } + + // When menu is out of screen on the top, move to bottom + if (menu.offsetTop < 0) { + menu.style.top = (menu.offsetTop + menu.clientHeight) + 'px'; + menu.style.bottom = 'auto'; } } diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 264c98a..8676337 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -931,7 +931,8 @@ div.help tt { padding: 0px 5px 5px 10px; } -body.main table.footer .popup_menu a, .popup_menu span { +body.main table.footer .popup_menu a, +.popup_menu span { display: block; padding-top: 1px; padding-bottom: 1px; @@ -946,7 +947,7 @@ body.main table.footer .popup_menu a, .popup_menu span { margin-top: 8px; } -.popup_menu a:hover { +body.main table.footer .popup_menu a:hover { text-decoration: underline; } @@ -1039,3 +1040,29 @@ table.debug_vars td { font-family: courier, monospace; } +/* Popup for adding to visuals (Dashboard, Reports */ + +div.graph, div.visualadd { + position: relative; +} + +div.visualadd { + display: inline-block; +} + +div.graph a.visualadd { + position: absolute; + top: 10px; + left: 10px; + + display: block; + width: 20px; + height: 20px; + background-image: url(images/button_add_dashlet_lo.png); +} + +div.graph a.visualadd:hover { + background-image: url(images/button_add_dashlet_hi.png); + cursor: pointer; +} + diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 822f9a0..75e1f1d 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -714,29 +714,3 @@ td.invtree table td { background-color: #fff; } -/* Popup for adding to visuals (Dashboard, Reports */ - -div.graph, div.visualadd { - position: relative; -} - -div.visualadd { - display: inline-block; -} - -div.graph a.visualadd { - position: absolute; - top: 10px; - left: 10px; - - display: block; - width: 20px; - height: 20px; - background-image: url(images/button_add_dashlet_lo.png); -} - -div.graph a.visualadd:hover { - background-image: url(images/button_add_dashlet_hi.png); - cursor: pointer; -} -

9 years, 9 months

Check_MK Git: check_mk: Added context button to all dashboards to edit dashlet page

by Lars Michelsen

Module: check_mk Branch: master Commit: e4df2c13f6314f2b51f7244ecf06eb9337caaeee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4df2c13f6314f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 13:54:01 2014 +0100 Added context button to all dashboards to edit dashlet page --- web/htdocs/dashboard.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 7fa419f..0140280 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -910,6 +910,7 @@ def page_edit_dashlet(): back_url = html.var('back', 'dashboard.py?name=%s&edit=1' % board) next_url = html.var('next', back_url) html.context_button(_('Back'), back_url, 'back') + html.context_button(_('All Dashboards'), 'edit_dashboards.py', 'dashboard') html.end_context_buttons() vs_general = Dictionary(

9 years, 9 months

Check_MK Git: check_mk: Fixed visual add to dashboard popup styling

by Lars Michelsen

Module: check_mk Branch: master Commit: 890c1107170330910f14280a05d530dacad2e892 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=890c1107170330… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 18:19:22 2014 +0100 Fixed visual add to dashboard popup styling --- web/htdocs/js/checkmk.js | 29 ++++++++++++++--------------- web/htdocs/pages.css | 13 +++++++------ web/htdocs/status.css | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 163dda4..0f8a9bf 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2235,7 +2235,7 @@ function handle_visualadd_close(event) { var target = getTarget(event); // Check whether or not a parent of the clicked node is the popup menu - while (target && target.id != 'visualadd_popup' && !has_class(target, 'statusicon')) { + while (target && target.id != 'visualadd_popup' && !has_class(target, 'visualadd')) { target = target.parentNode; } @@ -2301,20 +2301,19 @@ function add_dashboard_response_handler(data, response_text) } function fix_visualadd_menu_position(event, menu) { - var target = getTarget(event); - var dashboard = document.getElementById('dashboard'); - - // When menu is out of screen on the right, move to left - if (menu.offsetLeft + menu.clientWidth > pageWidth()) { - menu.style.left = (menu.offsetLeft - menu.clientWidth - 15) + 'px'; - menu.style.right = 'auto'; - } - - // When menu is out of screen on the top, move to bottom - if (menu.offsetTop < 0) { - menu.style.top = (menu.offsetTop + menu.clientHeight) + 'px'; - menu.style.bottom = 'auto'; - } + //var target = getTarget(event); + // + //// When menu is out of screen on the right, move to left + //if (menu.offsetLeft + menu.clientWidth > pageWidth()) { + // menu.style.left = (menu.offsetLeft - menu.clientWidth - 15) + 'px'; + // menu.style.right = 'auto'; + //} + + //// When menu is out of screen on the top, move to bottom + //if (menu.offsetTop < 0) { + // menu.style.top = (menu.offsetTop + menu.clientHeight) + 'px'; + // menu.style.bottom = 'auto'; + //} } function add_to_visual(visual_type, name) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 8676337..ce7e72d 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -901,7 +901,7 @@ div.help tt { | |_| |_| | '-------------------------------------------------------------------------*/ -.popup_menu { +body.main .popup_menu { position: absolute; bottom: 15px; left: 15px; @@ -919,20 +919,21 @@ div.help tt { border-radius: 5px; } -.popup_menu img { +body.main .popup_menu img { width: 12px; height: auto; vertical-align: bottom; } -.popup_menu ul { +body.main .popup_menu ul { list-style: none; margin: 0; padding: 0px 5px 5px 10px; } +body.main .popup_menu a, body.main table.footer .popup_menu a, -.popup_menu span { +body.main .popup_menu span { display: block; padding-top: 1px; padding-bottom: 1px; @@ -941,17 +942,17 @@ body.main table.footer .popup_menu a, color: #fff; } -.popup_menu span { +body.main .popup_menu span { padding-left: 0px; font-weight: bold; margin-top: 8px; } +body.main .popup_menu a:hover, body.main table.footer .popup_menu a:hover { text-decoration: underline; } - /*--Various----------------------------------------------------------------. | __ __ _ | | \ \ / /_ _ _ __(_) ___ _ _ ___ | diff --git a/web/htdocs/status.css b/web/htdocs/status.css index d47f987..0631c30 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -369,7 +369,7 @@ table.data tr.data td.pnpgraph { padding: 0; } -tr.data td.pnpgraph img { +tr.data td.pnpgraph div.graph > a > img { border: 1px solid #888; margin: 4px 4px 4px 4px; box-shadow: 1px 1px 3px #000000;

9 years, 9 months

Check_MK Git: check_mk: Added corner resizers for dashlets which have fixed sizes in both dimensions

by Lars Michelsen

Module: check_mk Branch: master Commit: 07800f1a279711eab7e497dc1e47c81a4d7abeb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07800f1a279711… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 15:41:36 2014 +0100 Added corner resizers for dashlets which have fixed sizes in both dimensions --- web/htdocs/dashboard.css | 31 ++++++++++++++ web/htdocs/js/dashboard.js | 98 +++++++++++++++++++++++++------------------- 2 files changed, 87 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=07800f1a27…

9 years, 9 months

Check_MK Git: check_mk: Dashboard editor menu can now be opened using right clicks even in non edit mode

by Lars Michelsen

Module: check_mk Branch: master Commit: 164e13945e4457104fd51d656f88775e4fba34ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=164e13945e4457… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 15:51:51 2014 +0100 Dashboard editor menu can now be opened using right clicks even in non edit mode --- web/htdocs/js/dashboard.js | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index f48e90c..08df64a 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -341,7 +341,7 @@ function update_dashlet(id, code) { // DASHBOARD EDITING // -function toggle_dashboard_controls(show, event) { +function toggle_dashboard_menu(show, event) { var controls = document.getElementById('controls'); if (!controls) return; // maybe not permitted -> skip @@ -395,7 +395,7 @@ var g_editing = false; function toggle_dashboard_edit() { // First hide the controls menu - toggle_dashboard_controls(false); + toggle_dashboard_menu(false); g_editing = !g_editing; @@ -720,22 +720,22 @@ function body_click_handler(event) { var target = getTarget(event); var button = getButton(event); - if (g_editing && target.id == 'dashboard' && button == 'RIGHT') { + if (target.id == 'dashboard' && button == 'RIGHT') { // right click on the empty dashboard area - toggle_dashboard_controls(undefined, event); + toggle_dashboard_menu(undefined, event); prevent_default_events(event); return false; } else if (target.parentNode.id == 'controls_toggle' && button == 'LEFT') { // left click on the controls menu - toggle_dashboard_controls(undefined, event); + toggle_dashboard_menu(undefined, event); prevent_default_events(event); return false; } else if (target.parentNode.id != 'controls_toggle' && (!target.parentNode.parentNode || !has_class(target.parentNode.parentNode, 'menu'))) { // Hide the controls menu when clicked somewhere else - toggle_dashboard_controls(false); + toggle_dashboard_menu(false); } return true; @@ -1135,13 +1135,8 @@ add_event_handler('click', function(e) { return body_click_handler(e); }); -// Totally disable the context menu for the dashboards in edit mode +// Totally disable the context menu for all dashboards add_event_handler('contextmenu', function(e) { - if (g_editing) { - prevent_default_events(e); - return false; - } - else { - return true; - } + prevent_default_events(e); + return false; });

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #1019

by Mathias Kettner

Module: check_mk Branch: master Commit: 8af7399ca86b1f7ea7feec22c0e7e55d2dd615d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8af7399ca86b1f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 18:01:05 2014 +0100 Updated bug entries #1019 --- .bugs/1019 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1019 b/.bugs/1019 index a970d1d..fa15cb6 100644 --- a/.bugs/1019 +++ b/.bugs/1019 @@ -1,10 +1,13 @@ Title: Oracle Tablespace Monitoring - TEMP Tablespaces Component: checks -State: open +Class: nastiness +State: done Date: 2013-09-04 11:22:25 Targetversion: 1.4.0 -Class: nastiness It is senseless to apply thresholds to TEMP tablespaces in oracle. On startup, the tablespace is small, but once allocated it grows and grows, but never gets smaller again. So we should either completely remove those tablespaces or at least disable the thresholds by default. + +2014-12-05 18:01:00: changed state open -> done +Obsoleted by our new ORACLE monitoring.

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2195, #1020, #2231

by Mathias Kettner

Module: check_mk Branch: master Commit: d125c32931c64194f7c9af2f07475e85f1116605 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d125c32931c641… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 18:00:15 2014 +0100 Updated bug entries #2195, #1020, #2231 --- .bugs/1020 | 6 ++++-- .bugs/2195 | 6 ++++-- .bugs/2231 | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.bugs/1020 b/.bugs/1020 index 9bed6aa..dd2d014 100644 --- a/.bugs/1020 +++ b/.bugs/1020 @@ -1,9 +1,9 @@ Title: cmk --snmpwalk does not always get all oids Component: core -State: open +Class: nastiness +State: done Date: 2013-09-04 11:27:53 Targetversion: future -Class: nastiness In some cases, on somehow broken devices, the cmk --snmpwalk feature does not get complete results. At the moment it walks the standard OIDs 1.2.6.1.2 and @@ -21,3 +21,5 @@ e.g. cmk --snmpwalk --extra-oid 1.3.5.1.4.3.5.3.5 HOST + +2014-12-05 17:58:54: changed state open -> done diff --git a/.bugs/2195 b/.bugs/2195 index 7c58a02..d1dcf4e 100644 --- a/.bugs/2195 +++ b/.bugs/2195 @@ -1,9 +1,11 @@ Title: Group all context boxes together into one box in visual editor Component: multisite -State: open +Class: nastiness +State: done Date: 2014-10-06 19:10:03 Targetversion: 1.2.5i1 -Class: nastiness Currently due to the large number of mostly useless boxes everything get's very confuscated... + +2014-12-05 17:59:47: changed state open -> done diff --git a/.bugs/2231 b/.bugs/2231 index 8f36632..e6f0094 100644 --- a/.bugs/2231 +++ b/.bugs/2231 @@ -1,9 +1,11 @@ Title: Put icon-column in all views at the same position Component: multisite -State: open +Class: nastiness +State: done Date: 2014-12-01 10:42:24 Targetversion: 1.2.5i1 -Class: nastiness Currently it is sometimes at the right of the output, sometimes at the left. + +2014-12-05 18:00:10: changed state open -> done

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0840

by Mathias Kettner

Module: check_mk Branch: master Commit: a5fd50960e4fb6c806c267650637c7b2ff02e855 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5fd50960e4fb6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 17:53:20 2014 +0100 Updated bug entries #0840 --- .bugs/840 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/840 b/.bugs/840 index de116e7..dbbe722 100644 --- a/.bugs/840 +++ b/.bugs/840 @@ -1,9 +1,11 @@ Title: Wato condition show only the name of a tag but not the group Component: wato -State: open +Class: nastiness +State: done Date: 2014-01-31 17:38:22 Targetversion: 1.2.5i1 -Class: nastiness If you have multiple tags with the same title but in diffrent groups you cant see it in the condition colums from which tag group this tag is + +2014-12-05 17:53:15: changed state open -> done

9 years, 9 months

Check_MK Git: check_mk: #1707 WATO rule editor: show title of tag group when rendering the conditions of a rule

by Mathias Kettner

Module: check_mk Branch: master Commit: 36b117f4ce7b9c430a4083167a5b6ea42cd953e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36b117f4ce7b9c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 17:53:04 2014 +0100 #1707 WATO rule editor: show title of tag group when rendering the conditions of a rule This makes things clearer if you use the same tag title in more than one group. --- .bugs/837 | 6 ++++-- .werks/1707 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 14 ++++++++++---- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.bugs/837 b/.bugs/837 index 3ea5614..a17d8c6 100644 --- a/.bugs/837 +++ b/.bugs/837 @@ -1,9 +1,9 @@ Title: Service levels are missing in gui Component: multisite -State: open +Class: nastiness +State: done Date: 2013-11-29 17:07:45 Targetversion: 1.2.3i6 -Class: nastiness Its not possible to see the service levels on Hosts/ Services in Multisite. The Reason is, that they are no part of the livestatus output. With cmc its not possible to looking into the configfile to see the sl. @@ -13,3 +13,5 @@ Create: - Filter - Add Detail views of Host / Service - Change Global Settings Group + +2014-12-05 17:41:26: changed state open -> done diff --git a/.werks/1707 b/.werks/1707 new file mode 100644 index 0000000..5aab2a6 --- /dev/null +++ b/.werks/1707 @@ -0,0 +1,9 @@ +Title: WATO rule editor: show title of tag group when rendering the conditions of a rule +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417798331 +Class: feature + +This makes things clearer if you use the same tag title in more than one group. diff --git a/ChangeLog b/ChangeLog index cc45988..bfc596b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -191,6 +191,7 @@ * 1561 Remove Auditlog from the main WATO menu and put it into the activate Changes page * 1562 Move manual checks into a new WATO module... * 1697 Allow non-Ascii characters in topic of host tag groups + * 1707 WATO rule editor: show title of tag group when rendering the conditions of a rule... * 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 24c94ec..e671adf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14486,12 +14486,18 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): html.write('<li class="condition">') alias = config.tag_alias(tag) + group_alias = config.tag_group_title(tag) if alias: - if negate: - html.write(_("Host is not of type ")) + if group_alias: + html.write(_("Host") + ": " + group_alias + " " + _("is") + " ") + if negate: + html.write("%s " % _("not")) else: - html.write(_("Host is of type ")) - html.write("" + alias + "") + if negate: + html.write(_("Host has tag")) + else: + html.write(_("Host does not have tag")) + html.write(" " + alias + "") else: if negate: html.write(_("Host has not the tag ") + "<tt>" + tag + "</tt>")

9 years, 9 months

Check_MK Git: check_mk: Predefine some service levels in the defaut configuration

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d92b33efbd2931a77d0c5ffc6447abec2050a53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d92b33efbd293… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 17:41:04 2014 +0100 Predefine some service levels in the defaut configuration --- .bugs/812 | 8 ++++++-- .bugs/818 | 7 +++++-- mkeventd/web/plugins/config/mkeventd.py | 6 ++++++ web/plugins/wato/globals_notification.py | 7 ++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.bugs/812 b/.bugs/812 index 50de5b9..704b99a 100644 --- a/.bugs/812 +++ b/.bugs/812 @@ -1,9 +1,9 @@ Title: Windows fileinfo gets invetorized without escaping backslashes Component: checks -State: open +Class: nastiness +State: done Date: 2012-11-20 15:16:48 Targetversion: 1.4.0 -Class: nastiness The fileinfo check does not escape backslashes upon inventory. resulting items would be i.e. c:\windows\test.ini WATO on the other hand does escape them, @@ -15,3 +15,7 @@ interprets texts as regular expressions (which again interprets backslashes!) Resolution: We put a nice icon into each text input that is being interpreted as regex. When you hover over the icon (or click on it?) you get a help page about regular expressions with nice examples etc. + +2014-12-05 17:20:07: changed state open -> done +When creating rules WATO now escapes regex-chars, so this should e +no problem. diff --git a/.bugs/818 b/.bugs/818 index 92a3d8e..8a9565d 100644 --- a/.bugs/818 +++ b/.bugs/818 @@ -1,9 +1,9 @@ Title: check_mk_agent can incorrectly detect postfix on RHEL Component: core -State: open +Class: nastiness +State: done Date: 2012-10-24 10:19:40 Targetversion: 1.2.3 -Class: nastiness osTicket ID 443234 This probably happens on CentOS too, since it's so similar to RHEL. @@ -38,3 +38,6 @@ fi Resolution could be: use postqueue -p instead of mailq, check with 'which postqueue' + +2014-12-05 17:22:05: changed state open -> done +Should work now. mailq is not anylonger being used. diff --git a/mkeventd/web/plugins/config/mkeventd.py b/mkeventd/web/plugins/config/mkeventd.py index 92a60d2..9a3abd5 100644 --- a/mkeventd/web/plugins/config/mkeventd.py +++ b/mkeventd/web/plugins/config/mkeventd.py @@ -32,3 +32,9 @@ mkeventd_notify_remotehost = None mkeventd_connect_timeout = 10 debug_mkeventd_queries = False log_rulehits = False +mkeventd_service_levels = [ + (0, _("(no Service level)")), + (10, _("Silver")), + (20, _("Gold")), + (30, _("Platinum")), +] diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 3b4c930..0f73e7b 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -248,7 +248,12 @@ register_configvar(group, "Event Console when you forward notifications to it and will override the " "setting of the matching rule."), allow_empty = False, - default_value = [ (0, _("(no service level)")) ], + default_value = [ + (0, _("(no Service level)")), + (10, _("Silver")), + (20, _("Gold")), + (30, _("Platinum")), + ], ), domain = "multisite", allow_reset = False,

9 years, 9 months

← Newer
1
...
26
27
28
29
30
31
32
...
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