Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

Refactoring: Moved safenet and more application check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: fda0750e2e2ddbaf68fee4e6bf689cce98c2d5f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fda0750e2e2ddb… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 20 14:27:32 2018 +0100 Refactoring: Moved safenet and more application check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I2f2d28b43623e0b7c1598cb8d1294cc941bb1e42 --- .../wato/check_parameters/netapp_systemtime.py | 59 ++++ cmk/gui/plugins/wato/check_parameters/ps.py | 328 ++++++++++++++++++ .../check_parameters/safenet_hsm_eventstats.py | 73 ++++ .../wato/check_parameters/safenet_hsm_operstats.py | 64 ++++ .../wato/check_parameters/safenet_ntls_clients.py | 40 +++ .../wato/check_parameters/safenet_ntls_links.py | 39 +++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 383 +-------------------- 7 files changed, 604 insertions(+), 382 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fda0750e2e…

5 years, 10 months

Moved popup menu logic to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: 048c0eca94be9c406f3be54115d7ef8a7aa0537d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=048c0eca94be9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:39 2018 +0100 Moved popup menu logic to dedicated module Change-Id: I1098451b26fc2e30da40f58c3e888f1f90509efa --- cmk/gui/htmllib.py | 14 +- cmk/gui/pagetypes.py | 6 +- cmk/gui/visuals.py | 7 +- .../gui/old/unittest_files/popup_trigger.unittest | 96 ++++---- web/htdocs/js/checkmk.js | 256 +------------------ web/htdocs/js/index.js | 2 + web/htdocs/js/modules/popup_menu.js | 270 +++++++++++++++++++++ 7 files changed, 336 insertions(+), 315 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=048c0eca94…

5 years, 10 months

Moved valuespec logic to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: b54220d0605b98ca6ea0d3da3bbe650c6bd8c9b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b54220d0605b98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:36:36 2018 +0100 Moved valuespec logic to dedicated module Change-Id: I5653749506581aeaef1191f7d881d4afece099c1 --- cmk/gui/valuespec.py | 61 ++- cmk/gui/wato/pages/rulesets.py | 4 +- cmk/gui/watolib.py | 4 +- web/htdocs/js/checkmk.js | 942 ----------------------------------- web/htdocs/js/index.js | 2 + web/htdocs/js/modules/valuespecs.js | 966 ++++++++++++++++++++++++++++++++++++ 6 files changed, 1007 insertions(+), 972 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b54220d060…

5 years, 10 months

Moved valuespec logic to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: f46969f6865ac5e9471a9e81939b2a0f9eeeeb90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f46969f6865ac5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 11:18:13 2018 +0100 Moved valuespec logic to dedicated module Change-Id: Ibeadb158bc67305dbfefa8287ad77475f2416948 --- cmk/gui/valuespec.py | 27 +-- web/htdocs/js/checkmk.js | 215 ++++++++++++++++++++++ web/htdocs/js/colorpicker.js | 2 + web/htdocs/js/index.js | 1 - web/htdocs/js/modules/valuespecs.js | 354 ++++++++---------------------------- 5 files changed, 303 insertions(+), 296 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f46969f686…

5 years, 10 months

Moved WATO logic to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: 92f2161c0a9d1cd170640592400a6ac18c170d2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92f2161c0a9d1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:39 2018 +0100 Moved WATO logic to dedicated module Change-Id: I377d11325461f1d944dd6c9200c3db8951b746fe --- cmk/gui/forms.py | 2 +- cmk/gui/plugins/wato/utils/__init__.py | 36 ++++---- cmk/gui/wato/pages/analyze_configuration.py | 2 +- cmk/gui/wato/pages/folders.py | 6 +- cmk/gui/wato/pages/notifications.py | 2 +- cmk/gui/wato/pages/users.py | 2 +- cmk/gui/watolib.py | 4 +- web/htdocs/js/checkmk.js | 8 ++ web/htdocs/js/index.js | 3 +- web/htdocs/js/{ => modules}/wato.js | 127 ++++++++++++---------------- 10 files changed, 91 insertions(+), 101 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=92f2161c0a…

5 years, 10 months

Moved row selection logic to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: 98f8bbfbfd0dd0d71f2dfaec3544ca9c786c16ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98f8bbfbfd0dd0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:40 2018 +0100 Moved row selection logic to dedicated module Change-Id: I6edb6da14731f983db4b9a990bbfeced298a120c --- cmk/gui/pagetypes.py | 2 +- cmk/gui/plugins/views/layouts.py | 11 +- cmk/gui/plugins/wato/bi.py | 4 +- cmk/gui/wato/mkeventd.py | 2 +- cmk/gui/wato/pages/folders.py | 13 +- cmk/gui/wato/pages/users.py | 2 +- web/htdocs/js/checkmk.js | 299 +------------------------------------ web/htdocs/js/modules/selection.js | 295 +++++++++++++++++++++++++++++++++++- 8 files changed, 309 insertions(+), 319 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=98f8bbfbfd…

5 years, 10 months

Moved remaining parts of checkmk.js to modules

by Lars Michelsen

Module: check_mk Branch: master Commit: 2c9a744cfe622bd820bc559249f45a4bc67cad2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c9a744cfe622b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 11:55:20 2018 +0100 Moved remaining parts of checkmk.js to modules Change-Id: I872fb1167e32a61462f1f7228cdd3a141b469e99 --- cmk/gui/htmllib.py | 19 +- cmk/gui/plugins/dashboard/stats.py | 2 +- cmk/gui/plugins/views/icons/builtin.py | 4 +- cmk/gui/plugins/views/layouts.py | 4 +- cmk/gui/plugins/views/painters.py | 2 +- cmk/gui/plugins/visuals/filters.py | 4 +- cmk/gui/plugins/wato/background_job.py | 4 +- cmk/gui/plugins/wato/bi.py | 14 +- cmk/gui/table.py | 3 +- cmk/gui/views.py | 11 +- cmk/gui/wato/pages/folders.py | 7 +- cmk/gui/wato/pages/services.py | 2 +- cmk/gui/wato/pages/users.py | 2 +- .../unittest_files/context_button_test.unittest | 128 +-- .../cmk/gui/old/unittest_files/text_input.unittest | 432 ++++----- tests/unit/cmk/gui/test_table.py | 8 +- web/htdocs/js/checkmk.js | 983 --------------------- web/htdocs/js/index.js | 9 +- web/htdocs/js/mobile.js | 1 - web/htdocs/js/modules/dashboard.js | 4 + web/htdocs/js/modules/forms.js | 18 + web/htdocs/js/modules/graph_integration.js | 225 +++++ web/htdocs/js/modules/reload_pause.js | 124 +++ web/htdocs/js/modules/selection.js | 57 ++ web/htdocs/js/modules/utils.js | 81 +- web/htdocs/js/modules/views.js | 262 ++++++ 26 files changed, 1104 insertions(+), 1306 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2c9a744cfe…

5 years, 10 months

Cleaned up dashboard dashlet JS code a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 262a7b5f7d1cce258afa4827208ad5c1bdedd9ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=262a7b5f7d1cce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 13:15:36 2018 +0100 Cleaned up dashboard dashlet JS code a bit Change-Id: Iee39d4076163f696ab37e944844e507e8803e2f6 --- cmk/gui/dashboard.py | 10 +++++----- cmk/gui/plugins/dashboard/utils.py | 4 +++- web/htdocs/js/modules/dashboard.js | 8 ++++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index a2e7d09..00caf70 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -554,7 +554,7 @@ def draw_dashboard(name): refresh_dashlets = [] # Dashlets with automatic refresh, for Javascript dashlet_coords = [] # Dimensions and positions of dashlet - on_resize_dashlets = [] # javascript function to execute after ressizing the dashlet + on_resize_dashlets = {} # javascript function to execute after ressizing the dashlet for nr, dashlet in enumerate(board["dashlets"]): dashlet_content_html = "" dashlet_title_html = "" @@ -568,7 +568,7 @@ def draw_dashboard(name): on_resize = get_dashlet_on_resize(dashlet_instance) if on_resize: - on_resize_dashlets.append(on_resize) + on_resize_dashlets[nr] = on_resize dashlet_title_html = render_dashlet_title_html(dashlet_instance) dashlet_content_html = render_dashlet_content(dashlet_instance, is_update=False) @@ -593,7 +593,7 @@ def draw_dashboard(name): "dashlet_padding": dashlet_padding, "dashlet_min_size": Dashlet.minimum_size, "refresh_dashlets": refresh_dashlets, - "on_resize_dashlets": dict(enumerate(on_resize_dashlets)), + "on_resize_dashlets": on_resize_dashlets, "dashboard_name": name, "dashboard_mtime": board['mtime'], "dashlets": dashlet_coords, @@ -819,7 +819,7 @@ def get_dashlet_refresh(dashlet_instance): def get_dashlet_on_resize(dashlet_instance): on_resize = dashlet_instance.on_resize() if on_resize: - return '%d: function() {%s}' % (dashlet_instance.dashlet_id, on_resize) + return '(function() {%s})' % on_resize return None @@ -901,7 +901,7 @@ def ajax_dashlet(): # prevent reloading on the dashboard which already has the current mtime, # this is normally the user editing this dashboard. All others: reload # the whole dashboard once. - html.javascript('if (cmk.dashboard.dashlet_properties.dashboard_mtime < %d) {\n' + html.javascript('if (cmk.dashboard.dashboard_properties.dashboard_mtime < %d) {\n' ' parent.location.reload();\n' '}' % board['mtime']) diff --git a/cmk/gui/plugins/dashboard/utils.py b/cmk/gui/plugins/dashboard/utils.py index 6eb96ee..0175d9e 100644 --- a/cmk/gui/plugins/dashboard/utils.py +++ b/cmk/gui/plugins/dashboard/utils.py @@ -26,6 +26,7 @@ """Module to hold shared code for module internals and the plugins""" import abc +import json import cmk.utils.plugin_registry @@ -350,7 +351,8 @@ class IFrameDashlet(Dashlet): html.close_div() if self.reload_on_resize(): - html.javascript('reload_on_resize["%d"] = "%s"' % (self._dashlet_id, iframe_url)) + html.javascript('cmk.dashboard.set_reload_on_resize(%s, %s);' % (json.dumps( + self._dashlet_id), json.dumps(iframe_url))) def _get_iframe_url(self): if not self.is_iframe_dashlet(): diff --git a/web/htdocs/js/modules/dashboard.js b/web/htdocs/js/modules/dashboard.js index d6b23a2..d4b4ea1 100644 --- a/web/htdocs/js/modules/dashboard.js +++ b/web/htdocs/js/modules/dashboard.js @@ -26,7 +26,11 @@ import * as utils from "utils"; import * as ajax from "ajax"; var reload_on_resize = {}; -var dashboard_properties = {}; +export var dashboard_properties = {}; + +export function set_reload_on_resize(dashlet_id, url) { + reload_on_resize[dashlet_id] = url; +} export function set_dashboard_properties(properties) { dashboard_properties = properties; @@ -1158,7 +1162,7 @@ function dashlet_resized(nr, dashlet_obj) { } if (typeof dashboard_properties.on_resize_dashlets[nr] != "undefined") { - dashboard_properties.on_resize_dashlets[nr](); + eval(dashboard_properties.on_resize_dashlets[nr])(); } }

5 years, 10 months

Made graphs.js a module and finalize JS modularization

by Lars Michelsen

Module: check_mk Branch: master Commit: dd943ec35158a7c28ef69ae87cc3c8c768974a29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd943ec35158a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 14:18:18 2018 +0100 Made graphs.js a module and finalize JS modularization * All our JS code is now separated into ES6 modules * The code is now eslint clean * Fixed some minor bugs Next steps could be to refurbish the code itself one day. Change-Id: Ib77dcff09e9c5119e4fe46520aae8d1add06f29a --- cmk/gui/dashboard.py | 4 ++-- cmk/gui/plugins/dashboard/graph.py | 4 ++-- cmk/gui/plugins/sidebar/speedometer.py | 2 +- web/htdocs/js/index.js | 25 ++++++++----------------- web/htdocs/js/{ => modules}/colorpicker.js | 0 web/htdocs/js/modules/dashboard.js | 2 +- web/htdocs/js/modules/utils.js | 8 -------- web/htdocs/js/modules/valuespecs.js | 6 +++--- webpack.config.js | 3 +-- 9 files changed, 18 insertions(+), 36 deletions(-) diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index 00caf70..4cbd4c2 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -738,7 +738,7 @@ def dashboard_edit_controls(name, board): html.open_a( href="edit_dashboard.py?load_name=%s&back=%s" % (name, html.urlencode(html.makeuri( []))), - onmouseover="hide_submenus();") + onmouseover="cmk.dashboard.hide_submenus();") html.img(src="images/trans.png") html.write(_('Properties')) html.close_a() @@ -753,7 +753,7 @@ def dashboard_edit_controls(name, board): html.open_a( href="javascript:void(0)", onclick="cmk.dashboard.toggle_dashboard_edit(false)", - onmouseover="hide_submenus();") + onmouseover="cmk.dashboard.hide_submenus();") html.img(src="images/trans.png") html.write(_('Stop Editing')) html.close_a() diff --git a/cmk/gui/plugins/dashboard/graph.py b/cmk/gui/plugins/dashboard/graph.py index 42c4332..12f3234 100644 --- a/cmk/gui/plugins/dashboard/graph.py +++ b/cmk/gui/plugins/dashboard/graph.py @@ -164,7 +164,7 @@ function dashboard_render_graph(nr, graph_identification, graph_render_options, + "&height=" + c_h + "&id=" + nr; - call_ajax("graph_dashlet.py", { + cmk.ajax.call_ajax("graph_dashlet.py", { post_data : post_data, method : "POST", response_handler : handle_dashboard_render_graph_response, @@ -185,7 +185,7 @@ function handle_dashboard_render_graph_response(handler_data, response_body) var container = document.getElementById('dashlet_graph_' + nr); container.innerHTML = response_body; - executeJSbyObject(container); + cmk.utils.execute_javascript_by_object(container); } function dashboard_render_pnpgraph(nr, img_url) diff --git a/cmk/gui/plugins/sidebar/speedometer.py b/cmk/gui/plugins/sidebar/speedometer.py index c400e03..2b652dc 100644 --- a/cmk/gui/plugins/sidebar/speedometer.py +++ b/cmk/gui/plugins/sidebar/speedometer.py @@ -98,7 +98,7 @@ function speedometer_show_speed(last_perc, program_start, scheduled_rate) "&scheduled_rate=" + scheduled_rate + "&program_start=" + program_start; - call_ajax(url, { + cmk.ajax.call_ajax(url, { response_handler: function(handler_data, response_body) { try { var data = JSON.parse(response_body); diff --git a/web/htdocs/js/index.js b/web/htdocs/js/index.js index a495dd2..4d95182 100644 --- a/web/htdocs/js/index.js +++ b/web/htdocs/js/index.js @@ -51,10 +51,13 @@ import * as reload_pause from "reload_pause"; import * as graph_integration from "graph_integration"; import * as dashboard from "dashboard"; -// TODO: Find a better solution for this CEE specific include +// Optional import is currently not possible using the ES6 imports +var graphs; try { - require("script-loader!../../../enterprise/web/htdocs/js/graphs.js"); -} catch(e) {} // eslint-disable-line no-empty + graphs = require("graphs"); +} catch(e) { + graphs = null; +} $(() => { utils.update_header_timer(); @@ -91,19 +94,7 @@ export default { views: views, reload_pause: reload_pause, graph_integration: graph_integration, + graphs: graphs, dashboard: dashboard - }, - // TODO: Compatibility for not yet modularized JS code - executeJSbyObject: utils.execute_javascript_by_object, - executeJS: utils.execute_javascript_by_id, - getTarget: utils.get_target, - getButton: utils.get_button, - prevent_default_events: utils.prevent_default_events, - has_class: utils.has_class, - remove_class: utils.remove_class, - add_class: utils.add_class, - change_class: utils.change_class, - get_url: ajax.get_url, - post_url: ajax.post_url, - call_ajax: ajax.call_ajax + } }; diff --git a/web/htdocs/js/colorpicker.js b/web/htdocs/js/modules/colorpicker.js similarity index 100% rename from web/htdocs/js/colorpicker.js rename to web/htdocs/js/modules/colorpicker.js diff --git a/web/htdocs/js/modules/dashboard.js b/web/htdocs/js/modules/dashboard.js index d4b4ea1..7a88259 100644 --- a/web/htdocs/js/modules/dashboard.js +++ b/web/htdocs/js/modules/dashboard.js @@ -412,7 +412,7 @@ function toggle_dashboard_menu(show, event) { } } -function hide_submenus() { +export function hide_submenus() { // hide all submenus var subs = document.getElementsByClassName("sub"); for (var i = 0; i < subs.length; i++) diff --git a/web/htdocs/js/modules/utils.js b/web/htdocs/js/modules/utils.js index d9e60e5..875af3d 100644 --- a/web/htdocs/js/modules/utils.js +++ b/web/htdocs/js/modules/utils.js @@ -71,14 +71,6 @@ export function update_contents(id, code) } } -// There may be some javascript code in the html code rendered by -// sidebar.py. Execute it here. This is needed in some browsers. -// TODO: Clean this special case up -export function execute_javascript_by_id(id) -{ - execute_javascript_by_object(document.getElementById(id)); -} - export var current_script = null; export function execute_javascript_by_object(obj) diff --git a/web/htdocs/js/modules/valuespecs.js b/web/htdocs/js/modules/valuespecs.js index b948cb0..4f31d33 100644 --- a/web/htdocs/js/modules/valuespecs.js +++ b/web/htdocs/js/modules/valuespecs.js @@ -575,7 +575,7 @@ export function listofmultiple_del(varprefix, ident) { // Remove it from the list of active elements var active = document.getElementById(varprefix + "_active"); var l = active.value.split(";"); - for (i in l) { + for (i = 0; i < l.length; i++) { if (l[i] == ident) { l.splice(i, 1); break; @@ -590,7 +590,7 @@ function listofmultiple_toggle_fields(root, varprefix, enable) { var types = ["input", "select", "textarea"]; for (var t in types) { var fields = root.getElementsByTagName(types[t]); - for (var i in fields) { + for (var i = 0; i < fields.length; i++) { fields[i].disabled = !enable; } } @@ -604,7 +604,7 @@ export function listofmultiple_init(varprefix) { // Mark input fields of unused elements as disabled var container = document.getElementById(varprefix + "_table"); var unused = document.getElementsByClassName("unused", container); - for (var i in unused) { + for (var i = 0; i < unused.length; i++) { listofmultiple_toggle_fields(unused[i], varprefix, false); } } diff --git a/webpack.config.js b/webpack.config.js index 60929eb..c61c2c4 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -22,8 +22,7 @@ module.exports = { modules: [ "node_modules", path.resolve(__dirname, "web/htdocs/js/modules"), - path.resolve(__dirname, "web/htdocs/js"), - path.resolve(__dirname, "enterprise/web/htdocs/js") + path.resolve(__dirname, "enterprise/web/htdocs/js/modules") ] }, module: {

5 years, 10 months

Moved crash reporting logic to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: d9c7e39219e406216cd2046f7db12edf9a94c2d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9c7e39219e406… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:36 2018 +0100 Moved crash reporting logic to dedicated module Change-Id: I889b2cfb1ff672a4af522aea7f0cd6d9d1ab5875 --- cmk/gui/crash_reporting.py | 4 +- web/htdocs/js/checkmk.js | 110 --------------------------- web/htdocs/js/index.js | 2 + web/htdocs/js/modules/crash_reporting.js | 126 +++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 112 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d9c7e39219…

5 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018