Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

Refactoring: Moved all skype check parameters from unsorted.py to dedicated modules ( CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: f89eb00e299006b06c89b71d70bb97beb010c62e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f89eb00e299006… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 20 13:45:50 2018 +0100 Refactoring: Moved all skype check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I55b30cd722d583055e19cbf1f71d1c8b25c64773 --- cmk/gui/plugins/wato/check_parameters/skype.py | 127 ++++++ .../wato/check_parameters/skype_conferencing.py | 76 ++++ .../plugins/wato/check_parameters/skype_edge.py | 79 ++++ .../wato/check_parameters/skype_edgeauth.py | 54 +++ .../check_parameters/skype_mediation_server.py | 87 ++++ .../plugins/wato/check_parameters/skype_mobile.py | 53 +++ .../plugins/wato/check_parameters/skype_proxy.py | 62 +++ cmk/gui/plugins/wato/check_parameters/skype_sip.py | 186 +++++++++ .../plugins/wato/check_parameters/skype_xmpp.py | 64 +++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 460 --------------------- 10 files changed, 788 insertions(+), 460 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f89eb00e29…

5 years, 6 months

7016 Dropdown fields are now searchable

by Lars Michelsen

Module: check_mk Branch: master Commit: 11fd2adf5c9d2ff0246309080c6fa054c10a1222 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11fd2adf5c9d2f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 20 07:45:01 2018 +0100 7016 Dropdown fields are now searchable * All dropdown fields with more than 5 choices are now searchable * This is realizied using jquery and select2 * The styling is similar to our theme but needs to be fine tuned CMK-520 Change-Id: I5f112e1eaa3db01d1caaba2d01bdf68e83472b67 --- .werks/7016 | 10 +++++ cmk/gui/htmllib.py | 16 +++++++- cmk/gui/sidebar.py | 6 ++- package.json | 7 ++++ .../cmk/gui/old/unittest_files/body_start.unittest | 2 +- .../cmk/gui/old/unittest_files/header.unittest | 4 +- .../cmk/gui/old/unittest_files/html_head.unittest | 6 +-- .../gui/old/unittest_files/icon_select.unittest | 24 +++++------ .../cmk/gui/old/unittest_files/select.unittest | 48 +++++++++++----------- web/htdocs/.gitignore | 1 + web/htdocs/check_mk.css | 4 ++ web/htdocs/js/index.js | 6 +++ web/htdocs/js/modules/forms.js | 36 ++++++++++++++++ web/htdocs/js/side_index.js | 1 + webpack.config.js | 24 +++++++++-- 15 files changed, 147 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=11fd2adf5c…

5 years, 6 months

Fix web directory .f12: Use the makefile

by Lars Michelsen

Module: check_mk Branch: master Commit: ec91cb20bd4eb8d18bf892c31ee11e6e74ad883e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec91cb20bd4eb8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 20 16:34:07 2018 +0100 Fix web directory .f12: Use the makefile Change-Id: Ibe3745a76355b890d108b7fe971168dc7b42cdde --- web/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/.f12 b/web/.f12 index 90d3425..7fd2aa5 100755 --- a/web/.f12 +++ b/web/.f12 @@ -6,7 +6,7 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} ROOT=/omd/sites/$SITE echo "Updating compiled JS files..." -(cd .. ; node_modules/.bin/webpack) +make -C .. web/htdocs/js/main_min.js web/htdocs/js/mobile_min.js web/htdocs/js/side_min.js echo "Update site $SITE..."

5 years, 6 months

Introduce npm and webpack environment for improving JS frontend development

by Lars Michelsen

Module: check_mk Branch: master Commit: 022dcd95c882cb969831b459b120c4fa2e815abf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=022dcd95c882cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 19 11:16:39 2018 +0100 Introduce npm and webpack environment for improving JS frontend development * Next steps: * Modularize our own JS code and integrate it with the GUI * Cleanup the previous JS minify logic Change-Id: I9a9abbee4178a128141852e664f4c5c51754d84f --- .gitignore | 1 + package.json | 23 +++++++++++++++++++++++ web/Makefile | 5 +++++ webpack.config.js | 17 +++++++++++++++++ 4 files changed, 46 insertions(+) diff --git a/.gitignore b/.gitignore index c3ec4772..8d4517c 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ tests/web/data/* .venv *.gcov htmlcov/ +node_modules/ diff --git a/package.json b/package.json new file mode 100644 index 0000000..79ef440 --- /dev/null +++ b/package.json @@ -0,0 +1,23 @@ +{ + "name": "check_mk", + "version": "1.0.0", + "description": "Check_MK - Your complete IT monitoring solution", + "main": "web/htdocs/js/index.js", + "directories": { + "doc": "doc", + "test": "tests" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "http://git.mathias-kettner.de/check_mk.git" + }, + "author": "", + "license": "GPL-2.0", + "devDependencies": { + "webpack": "^4.27.1", + "webpack-cli": "^3.1.2" + } +} diff --git a/web/Makefile b/web/Makefile new file mode 100644 index 0000000..f51990b --- /dev/null +++ b/web/Makefile @@ -0,0 +1,5 @@ +setup: + sudo apt-get install \ + npm + npm install + diff --git a/webpack.config.js b/webpack.config.js new file mode 100644 index 0000000..2998d12 --- /dev/null +++ b/webpack.config.js @@ -0,0 +1,17 @@ +var path = require('path'); + +module.exports = { + mode: 'development', + entry: './web/htdocs/js/index.js', + output: { + path: path.resolve(__dirname, 'web/htdocs/js'), + filename: 'main.js', + publicPath: 'js' + }, + resolve: { + modules: [ + "node_modules", + path.resolve(__dirname, "web/htdocs/js") + ] + } +};

5 years, 6 months

First integration of npm and webpack in our GUI and packaging workflow

by Lars Michelsen

Module: check_mk Branch: master Commit: 37d888312fecddbc5e85ceebf7edc18519c1a054 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37d888312fecdd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 19 14:38:45 2018 +0100 First integration of npm and webpack in our GUI and packaging workflow * Our javascript code is integrated as is for the moment and not modularized yet * The GUI now loads either main_min.js or main.js which is a file JS file including all our own JS code and the dependencies compiled by webpack * The mobile GUI loads the mobile_min.js which includes the already shipped outdated versions of jquery and jquery mobile * The previous "slimit" based minify logic has been removed * Made ESLint know about the new enviornment * Add babel for browser compatibility. Starting with these supported: and_chr 70 and_ff 63 and_qq 1.2 and_uc 11.8 android 67 android 4.4.3-4.4.4 baidu 7.12 chrome 70 chrome 69 edge 18 edge 17 firefox 63 firefox 62 ie 11 ie_mob 11 ios_saf 12.0-12.1 ios_saf 11.3-11.4 op_mini all op_mob 46 opera 57 opera 56 safari 12 safari 11.1 samsung 7.2 samsung 6.2 Change-Id: I304f2b7b5413ce8d0a17c095bab27dd65cc1b96f --- .eslintrc.json | 12 ++++--- Makefile | 17 ++++------ cmk/gui/dashboard.py | 3 +- cmk/gui/htmllib.py | 2 +- cmk/gui/mobile.py | 5 +-- cmk/gui/notifications.py | 3 +- cmk/gui/plugins/dashboard/snapin.py | 3 +- cmk/gui/plugins/sidebar/quicksearch.py | 1 - cmk/gui/plugins/views/availability.py | 2 +- cmk/gui/plugins/wato/utils/html_elements.py | 2 +- cmk/gui/prediction.py | 1 - cmk/gui/sidebar.py | 3 +- cmk/gui/wato/pages/activate_changes.py | 1 - cmk/gui/wato/user_profile.py | 6 ++-- package.json | 11 +++++++ .../cmk/gui/old/unittest_files/body_start.unittest | 2 +- .../cmk/gui/old/unittest_files/header.unittest | 12 +++---- .../cmk/gui/old/unittest_files/html_head.unittest | 14 ++++---- web/.f12 | 11 ++----- web/htdocs/js/.gitignore | 1 + web/htdocs/js/checkmk.js | 1 - web/htdocs/js/index.js | 12 +++++++ web/htdocs/js/mobile.js | 4 +++ webpack.config.js | 37 ++++++++++++++++++---- 24 files changed, 99 insertions(+), 67 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=37d888312f…

5 years, 6 months

Made quicksearch JS code a dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: e3e78a95caf9efacf94ac9cd23a739d0ba54246f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3e78a95caf9ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 19 21:16:27 2018 +0100 Made quicksearch JS code a dedicated module * Moved the needed utility functions to separate modules on the way. * Separated the sidebar JS code from the rest by compiling a dedicated side_min.js out of side_index.js. * Some linter cleanups and minor bug fixes on the way Change-Id: Ia98dbf92ad9385990ddedb2b0aa1bc9955a20350 --- .eslintrc.json | 3 +- cmk/gui/htmllib.py | 3 + cmk/gui/plugins/sidebar/quicksearch.py | 7 +- cmk/gui/sidebar.py | 4 +- web/htdocs/js/checkmk.js | 135 +-------------------- web/htdocs/js/index.js | 16 ++- web/htdocs/js/modules/ajax.js | 135 +++++++++++++++++++++ .../js/{search.js => modules/quicksearch.js} | 80 ++++++------ web/htdocs/js/modules/utils.js | 46 +++++++ web/htdocs/js/side_index.js | 40 ++++++ web/htdocs/js/sidebar.js | 16 +-- webpack.config.js | 4 +- 12 files changed, 296 insertions(+), 193 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e3e78a95ca…

5 years, 6 months

Made prediction.js a module

by Lars Michelsen

Module: check_mk Branch: master Commit: 31c930e60d3fcc3dcc47bea0942983a1dca61eec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31c930e60d3fcc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 19 17:32:43 2018 +0100 Made prediction.js a module Change-Id: I868aea6c671e16cb1ca7db94cd29fa42fdb6276c --- cmk/gui/prediction.py | 21 ++++++----- web/htdocs/js/checkmk.js | 1 - web/htdocs/js/index.js | 46 ++++++++++++++++++---- web/htdocs/js/{ => modules}/prediction.js | 63 ++++++++++++++++--------------- webpack.config.js | 4 +- 5 files changed, 84 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=31c930e60d…

5 years, 6 months

Fixed service discovery of hosts in non-main folders after implementation of asynchronous discovery

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ab32227daf1a033daa1297baa36d9749062c3c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ab32227daf1a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 20 13:20:53 2018 +0100 Fixed service discovery of hosts in non-main folders after implementation of asynchronous discovery Change-Id: Ieb315e075b5d1afbc6b6ae9934c5f74e588c4c11 --- cmk/gui/wato/pages/services.py | 21 ++++++++++++++------- web/htdocs/js/wato.js | 14 +++++++++----- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index ba10d94..eaa7b9a 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -130,6 +130,7 @@ DiscoveryOptions = NamedTuple("DiscoveryOptions", [ StartDiscoveryRequest = NamedTuple("StartDiscoveryRequest", [ ("host", watolib.Host), + ("folder", watolib.Folder), ("options", DiscoveryOptions), ]) @@ -214,8 +215,9 @@ class ModeDiscovery(WatoMode): def page(self): self._async_progress_msg_container() self._service_container() - html.javascript("start_service_discovery(%s, %s)" % (json.dumps(self._host.name()), - json.dumps(self._options._asdict()))) + html.javascript("start_service_discovery(%s, %s, %s)" % + (json.dumps(self._host.name()), json.dumps(self._host.folder().path()), + json.dumps(self._options._asdict()))) def _async_progress_msg_container(self): html.open_div(id_="async_progress_msg") @@ -330,7 +332,8 @@ class AutomationServiceDiscoveryJob(AutomationCommand): host.need_permission("read") options = json.loads(html.get_ascii_input("options")) - return StartDiscoveryRequest(host=host, options=DiscoveryOptions(**options)) + return StartDiscoveryRequest( + host=host, folder=host.folder(), options=DiscoveryOptions(**options)) def execute(self, request): # type: (StartDiscoveryRequest) -> str @@ -461,7 +464,8 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): request.setdefault("update_target", None) request.setdefault("update_services", []) - self._host = watolib.Folder.current().host(request["host_name"]) + folder = watolib.Folder.folder(request["folder_path"]) + self._host = folder.host(request["host_name"]) if not self._host: raise MKUserError("host", _("You called this page with an invalid host name.")) self._host.need_permission("read") @@ -591,7 +595,8 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): def _get_check_table(self): # type: () -> DiscoveryResult - return _get_check_table(StartDiscoveryRequest(self._host, self._options)) + return _get_check_table( + StartDiscoveryRequest(self._host, self._host.folder(), self._options)) def _update_persisted_discovery_options(self): show_checkboxes = config.user.load_file("discovery_checkboxes", False) @@ -1003,8 +1008,9 @@ class DiscoveryPageRenderer(object): def _start_js_call(self, options, request_vars=None): # type: (DiscoveryOptions, dict) -> str - return "start_service_discovery(%s, %s, %s, %s)" % ( + return "start_service_discovery(%s, %s, %s, %s, %s)" % ( json.dumps(self._host.name()), + json.dumps(self._host.folder().path()), json.dumps(options._asdict()), json.dumps(html.transaction_manager.get()), json.dumps(request_vars), @@ -1114,8 +1120,9 @@ class DiscoveryPageRenderer(object): div_id = "activecheck_%s" % descr html.div(html.render_icon("reload", cssclass="reloading"), id_=div_id) - html.final_javascript("execute_active_check(%s, %s, %s, %s, %s);" % ( + html.javascript("execute_active_check(%s, %s, %s, %s, %s, %s);" % ( json.dumps(self._host.site_id() or ''), + json.dumps(self._host.folder().path()), json.dumps(self._host.name()), json.dumps(check_type), json.dumps(item), diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index f774c90..16046e8 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -902,7 +902,7 @@ function start_host_diag_test(ident, hostname, transid) { var g_service_discovery_result = null; var g_show_updating_timer = null; -function start_service_discovery(host_name, discovery_options, transid, request_vars) +function start_service_discovery(host_name, folder_path, discovery_options, transid, request_vars) { // When we receive no response for 2 seconds, then show the updating message g_show_updating_timer = setTimeout(function() { @@ -913,19 +913,21 @@ function start_service_discovery(host_name, discovery_options, transid, request_ monitor_async_progress({ "update_url" : "ajax_service_discovery.py", "host_name": host_name, + "folder_path": folder_path, "transid": transid, "start_time" : time(), "is_finished_function": is_service_discovery_finished, "update_function": update_service_discovery, "finish_function": finish_service_discovery, - "post_data": get_service_discovery_post_data(host_name, discovery_options, transid, request_vars) + "post_data": get_service_discovery_post_data(host_name, folder_path, discovery_options, transid, request_vars) }); } -function get_service_discovery_post_data(host_name, discovery_options, transid, request_vars) +function get_service_discovery_post_data(host_name, folder_path, discovery_options, transid, request_vars) { var request = { "host_name": host_name, + "folder_path": folder_path, "discovery_options": discovery_options, "discovery_result": g_service_discovery_result }; @@ -982,11 +984,12 @@ function update_service_discovery(handler_data, response) { } g_service_discovery_result = response.discovery_result; - handler_data.post_data = get_service_discovery_post_data(handler_data.host_name, response.discovery_options, handler_data.transid); + handler_data.post_data = get_service_discovery_post_data(handler_data.host_name, handler_data.folder_path, response.discovery_options, handler_data.transid); var container = document.getElementById("service_container"); container.style.display = "block"; container.innerHTML = response.body; + executeJSbyObject(container); update_service_discovery_activate_changes_button(response); } @@ -1035,11 +1038,12 @@ function lock_service_discovery_controls(lock) // | | // '-----------------------------------------------------------------------' -function execute_active_check(site, hostname, checktype, item, divid) +function execute_active_check(site, folder_path, hostname, checktype, item, divid) { var oDiv = document.getElementById(divid); var url = "wato_ajax_execute_check.py?" + "site=" + encodeURIComponent(site) + + "&folder=" + encodeURIComponent(folder_path) + "&host=" + encodeURIComponent(hostname) + "&checktype=" + encodeURIComponent(checktype) + "&item=" + encodeURIComponent(item);

5 years, 6 months

EC: Minor cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 00807d12d26fbb766f8a7ace05b3fff6de13a810 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00807d12d26fbb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Dec 20 14:02:00 2018 +0100 EC: Minor cleanup Change-Id: If21c957229e6bc25b973c3856b441ebd212e4f34 --- cmk/ec/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 4e10814..0542d05 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -277,7 +277,7 @@ def drain_pipe(pipe): if pipe in readable: try: data = os.read(pipe, 4096) - if len(data) == 0: # END OF FILE! + if not data: # EOF break except Exception: break # Error while reading @@ -2499,7 +2499,7 @@ class Queries(object): if len(parts) > 1: break data = self._socket.recv(4096) - if len(data) == 0: + if not data: if len(self._buffer) == 0: raise StopIteration() parts = [self._buffer, ""]

5 years, 6 months

Fixed path to our own rrdtool version during linking.

by Sven Panne

Module: check_mk Branch: master Commit: 2e6a253a74dd3c21b58f0baf236ea3282573e4bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e6a253a74dd3c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 20 15:10:48 2018 +0100 Fixed path to our own rrdtool version during linking. Change-Id: I4f246cf81a8be53c8e8f266b11ca8b264b7dbbeb --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a81b910..673ffcc 100644 --- a/Makefile +++ b/Makefile @@ -400,8 +400,8 @@ config.status: $(DIST_DEPS) else \ BOOST_OPT="DUMMY1=" ; \ fi ; \ - if test -d "omd/packages/rrdtool/rrdtool-1.7.0/src/.libs"; then \ - RRD_OPT="LDFLAGS=-L$(realpath omd/packages/rrdtool/rrdtool-1.7.0/src/.libs)" ; \ + if test -d "omd/rrdtool-1.7.0/src/.libs"; then \ + RRD_OPT="LDFLAGS=-L$(realpath omd/rrdtool-1.7.0/src/.libs)" ; \ else \ RRD_OPT="DUMMY2=" ; \ fi ; \

5 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018