Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Fixed broken edit cluster link since latest WATO mode cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 70985cd81ace02b679a3f1d72dc2d110655b5ffc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70985cd81ace02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 20:20:45 2018 +0200 Fixed broken edit cluster link since latest WATO mode cleanups Change-Id: I22070060544e14a32165f6304d28a773a192a54e --- cmk/gui/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index ecc626c..c7a4dca 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -2926,7 +2926,7 @@ class CREHost(WithPermissionsAndAttributes): def edit_url(self): return html.makeuri_contextless([ - ("mode", "edit_cluster" if self.is_cluster() else "edit_host"), + ("mode", "edit_host"), ("folder", self.folder().path()), ("host", self.name()), ])

6 years, 2 months

Add TODO

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fa8423bd861857b015680350b3d64aad7c29546 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fa8423bd86185… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 20:37:23 2018 +0200 Add TODO Change-Id: I3cc57eef64aeef55f905da0e2c2bfe412c9c21d9 --- cmk/gui/plugin_registry.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmk/gui/plugin_registry.py b/cmk/gui/plugin_registry.py index 2080608..ddd68bc 100644 --- a/cmk/gui/plugin_registry.py +++ b/cmk/gui/plugin_registry.py @@ -26,6 +26,10 @@ import abc +# TODO: We decided to change this plugin registry from automatically finding +# it's childs to explicit registration. +# TODO: In the moment we have this, we can drop the auto_register stuff. + class Registry(object): """The management object for all available plugins of a component.

6 years, 2 months

Fixed access to not existing member since html/http split

by Lars Michelsen

Module: check_mk Branch: master Commit: 52a712ebf6e3e944ada9ad98d5b507f38ba0e7cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52a712ebf6e3e9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 20:41:51 2018 +0200 Fixed access to not existing member since html/http split Change-Id: I165eee1517eb36339660f3b832bc0b4883eefef1 --- cmk/gui/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/wato/mkeventd.py b/cmk/gui/plugins/wato/mkeventd.py index d045caa..7669f6d 100644 --- a/cmk/gui/plugins/wato/mkeventd.py +++ b/cmk/gui/plugins/wato/mkeventd.py @@ -2282,7 +2282,7 @@ class ModeEventConsoleMIBs(EventConsoleMode): return "" else: return - elif "_upload_mib" in html.uploads: + elif html.request.uploaded_file("_upload_mib"): uploaded_mib = html.request.uploaded_file("_upload_mib") filename, mimetype, content = uploaded_mib if filename:

6 years, 2 months

Simplified pylint execution

by Lars Michelsen

Module: check_mk Branch: master Commit: a44212ecab13bd07e42dbf7743a1ec3e0fa546a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a44212ecab13bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 13 08:41:04 2018 +0200 Simplified pylint execution test_pylint_web is now simply invoking a single pylint call on web/app/index.wsgi, cmk/gui, enterprise/cmk/gui/cee and managed/cmk/gui/cme Change-Id: I4581f21737070fce232fa8603624b907ee01c9c3 --- tests/pylint/test_pylint_web.py | 72 ++--------------------------------------- tests/testlib/pylint_cmk.py | 7 ++-- 2 files changed, 7 insertions(+), 72 deletions(-) diff --git a/tests/pylint/test_pylint_web.py b/tests/pylint/test_pylint_web.py index bd3eed1..4859fa6 100755 --- a/tests/pylint/test_pylint_web.py +++ b/tests/pylint/test_pylint_web.py @@ -1,75 +1,9 @@ #!/usr/bin/python # encoding: utf-8 -import os -import sys -import glob -import tempfile - -from testlib import cmk_path, cmc_path, cme_path +from testlib import cmk_path import testlib.pylint_cmk as pylint_cmk -def get_web_plugin_dirs(): - plugin_dirs = sorted(list(set(os.listdir(cmk_path() + "/web/plugins") - + os.listdir(cmc_path() + "/web/plugins") - + os.listdir(cme_path() + "/web/plugins")))) - return plugin_dirs - - -def get_plugin_files(plugin_dir): - files = [] - - for path in [ cmk_path() + "/web/plugins/" + plugin_dir, - cmc_path() + "/web/plugins/" + plugin_dir, - cme_path() + "/web/plugins/" + plugin_dir ]: - if os.path.exists(path): - files += [ (f, path) for f in os.listdir(path) ] - - return sorted(files) - - -def test_pylint_web(pylint_test_dir): - # Make compiled files import eachother by default - sys.path.insert(0, pylint_test_dir) - - # Move the whole plugins code to their modules, then - # run pylint only on the modules - for plugin_dir in get_web_plugin_dirs(): - files = get_plugin_files(plugin_dir) - - for plugin_file, plugin_base in files: - plugin_path = plugin_base +"/"+plugin_file - - if plugin_file.startswith('.'): - continue - elif plugin_dir in ["icons","perfometer"]: - module_name = "views" - elif plugin_dir == "pages": - module_name = "modules" - else: - module_name = plugin_dir - - module_path = pylint_test_dir + "/" + module_name + ".py" - - # In case a module has already been moved to cmk.gui and there are plugins - # that have not been moved yet get the main module code from cmk.gui - if not os.path.exists(module_path): - module = file(module_path, "a") - - if os.path.exists(cmk_path() + "/cmk/gui/" + module_name + ".py"): - module_main_path = cmk_path() + "/cmk/gui/" + module_name + ".py" - elif os.path.exists(cmk_path() + "/cmk/gui/cee/" + module_name + ".py"): - module_main_path = cmk_path() + "/cmk/gui/cee/" + module_name + ".py" - elif os.path.exists(cmk_path() + "/cmk/gui/cme/" + module_name + ".py"): - module_main_path = cmk_path() + "/cmk/gui/cme/" + module_name + ".py" - else: - raise Exception() - - pylint_cmk.add_file(module, module_main_path) - - print("[%s] add %s" % (module_name, plugin_path)) - with open(module_path, "a") as module: - pylint_cmk.add_file(module, plugin_path) - - exit_code = pylint_cmk.run_pylint(pylint_test_dir) +def test_pylint_web(): + exit_code = pylint_cmk.run_pylint(cmk_path(), ["web/app/index.wsgi", "cmk/gui", "enterprise/cmk/gui/cee", "managed/cmk/gui/cme"]) assert exit_code == 0, "PyLint found an error in the web code" diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 486bcaf..d3704fc 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -47,10 +47,11 @@ def run_pylint(base_path, check_files=None): #, cleanup_test_dir=False): pylint_cfg = repo_path() + "/pylintrc" - check_files = get_pylint_files(base_path, "*") if not check_files: - print "Nothing to do..." - return 0 # nothing to do + check_files = get_pylint_files(base_path, "*") + if not check_files: + print "Nothing to do..." + return 0 # nothing to do cmd = [ "python", "-m", "pylint",

6 years, 2 months

Fixed cyclic dependency between wato and modules

by Lars Michelsen

Module: check_mk Branch: master Commit: 49aa8533c0c93fb87bacaf2c680fa2dc194d05b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49aa8533c0c93f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Fixed cyclic dependency between wato and modules Change-Id: I0d56fa682a8ed49b4c0acdd491f8a018601d8eba --- cmk/gui/wato/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index a74e6f4..86e5bf9 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -114,7 +114,6 @@ import cmk.gui.login as login import cmk.gui.mkeventd as mkeventd import cmk.gui.forms as forms import cmk.gui.backup as backup -import cmk.gui.modules as multisite_modules import cmk.gui.watolib as watolib import cmk.gui.gui_background_job as gui_background_job import cmk.gui.i18n @@ -14874,7 +14873,6 @@ def page_user_profile(change_pw=False): # load the new language cmk.gui.i18n.localize(config.user.language()) - multisite_modules.load_all_plugins() user = users.get(config.user.id) if config.user.may('general.edit_notifications') and user.get("notifications_enabled"):

6 years, 2 months

Changed imports of tests to new module names

by Lars Michelsen

Module: check_mk Branch: master Commit: df3833933674fe98deb3b700604db244e84bce22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df3833933674fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 13:56:34 2018 +0200 Changed imports of tests to new module names Change-Id: I4a1de93c327ed11fcbeed501644c43eb9786aef8 --- tests/integration/web/test_backup.py | 2 +- tests/unit/web/old/test_integration.py | 5 +++-- tests/unit/web/test_htmllib_Encoder.py | 2 +- tests/unit/web/test_htmllib_TimeoutManager.py | 2 +- tests/unit/web/test_htmllib_TransactionManager.py | 2 +- tests/unit/web/test_table.py | 5 +++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/integration/web/test_backup.py b/tests/integration/web/test_backup.py index df977fe..7926673 100644 --- a/tests/integration/web/test_backup.py +++ b/tests/integration/web/test_backup.py @@ -4,7 +4,7 @@ def test_backup_key_create_web(site, monkeypatch): if site.file_exists("etc/check_mk/backup_keys.mk"): site.delete_file("etc/check_mk/backup_keys.mk") - import wato + import cmk.gui.wato as wato mode = wato.ModeBackupEditKey() try: diff --git a/tests/unit/web/old/test_integration.py b/tests/unit/web/old/test_integration.py index b5ac3b6..b3555bf 100644 --- a/tests/unit/web/old/test_integration.py +++ b/tests/unit/web/old/test_integration.py @@ -6,6 +6,7 @@ from classes import HTMLTester from html_tests import load_html_test +from cmk.gui.htmllib import HTML def run_tests(function_name, tests=None): tests = load_html_test(function_name) @@ -43,7 +44,7 @@ def test_popup_trigger(): def test_header(monkeypatch): - import config + import cmk.gui.config as config monkeypatch.setattr(config, "custom_style_sheet", None, raising=False) for function_name in ["default_html_headers", "top_heading", "top_heading_left", "top_heading_right", "html_head", "header"]: @@ -73,7 +74,7 @@ def test_context_buttons(): def test_body_foot(monkeypatch): - import config + import cmk.gui.config as config monkeypatch.setattr(config, "custom_style_sheet", None, raising=False) for function_name in ["body_start", "html_foot"]: diff --git a/tests/unit/web/test_htmllib_Encoder.py b/tests/unit/web/test_htmllib_Encoder.py index 4f51047..cbd3a1d 100644 --- a/tests/unit/web/test_htmllib_Encoder.py +++ b/tests/unit/web/test_htmllib_Encoder.py @@ -3,7 +3,7 @@ import pytest -import htmllib +import cmk.gui.htmllib as htmllib def test_htmllib_integration(register_builtin_html): assert type(html.encoder) == htmllib.Encoder diff --git a/tests/unit/web/test_htmllib_TimeoutManager.py b/tests/unit/web/test_htmllib_TimeoutManager.py index f451f2d..ab61e57 100644 --- a/tests/unit/web/test_htmllib_TimeoutManager.py +++ b/tests/unit/web/test_htmllib_TimeoutManager.py @@ -3,7 +3,7 @@ import time import pytest -import htmllib +import cmk.gui.htmllib as htmllib from cmk.gui.exceptions import RequestTimeout def test_htmllib_integration(register_builtin_html): diff --git a/tests/unit/web/test_htmllib_TransactionManager.py b/tests/unit/web/test_htmllib_TransactionManager.py index 6c92682..9063204 100644 --- a/tests/unit/web/test_htmllib_TransactionManager.py +++ b/tests/unit/web/test_htmllib_TransactionManager.py @@ -4,7 +4,7 @@ import pytest import time import cmk.gui.http as http -import htmllib +import cmk.gui.htmllib as htmllib @pytest.fixture() def tm(): diff --git a/tests/unit/web/test_table.py b/tests/unit/web/test_table.py index 54dfc15..c456997 100644 --- a/tests/unit/web/test_table.py +++ b/tests/unit/web/test_table.py @@ -7,7 +7,8 @@ import pytest from tools import compare_html, gentest, compare_and_empty, bcolors -import htmllib +from cmk.gui.i18n import _ +import cmk.gui.htmllib as htmlllib import cmk.gui.http as http import cmk.gui.table as table from cmk.gui.table import Table @@ -165,7 +166,7 @@ def test_table_cubical(register_builtin_html, monkeypatch, sortable, searchable, # TODO: Better mock the access to save_user in table.* def save_user_mock(name, data, user, unlock=False): pass - import config + import cmk.gui.config as config monkeypatch.setattr(config, "save_user_file", save_user_mock) # Test data

6 years, 2 months

Refactored page handler registration to decorator mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 08d666b9762c27c9e0e021f7f1a3a0fc760b745c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08d666b9762c27… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:02:19 2018 +0200 Refactored page handler registration to decorator mechanism * Needed to clean this up because of several cyclic imports * Each function that should be called when a specific URL is requested needs to be registered to the GUI. This was previously done creating a plugin in the web/plugin/pages hierarchy * Now this is done right where the handler function is defined using a decorator. Import "cmk.gui.pages" and prefix the function definition with a line like this: @cmk.gui.pages.register("name_of_page"). For example: import cmk.gui.pages @cmk.gui.pages.register("my_test_page") def page_my_test_page(): ... This page will then be available to the user under the URL (check_mk/my_test_page.py). * When you create a new main module for the GUI the pages plugin was previously used to make the GUI know your module. This is now done using the "main_module" plugin hierarchy. To register a main module drop a .py file into cmk/gui/plugins/main_modules and add the import of your "cmk.gui.[name]" top level module there. The GUI will then automatically import this module and register the things you like add to the GUI with it (for example page handlers). Change-Id: I7fa75df6d439821188887c43da718350d67dd893 --- cmk/gui/bi.py | 6 ++ cmk/gui/crash_reporting.py | 12 +++ cmk/gui/cron.py | 2 + cmk/gui/dashboard.py | 13 ++- cmk/gui/help.py | 5 +- cmk/gui/inventory.py | 2 + cmk/gui/login.py | 5 + cmk/gui/logwatch.py | 2 + cmk/gui/main.py | 2 + cmk/gui/metrics.py | 4 + cmk/gui/mobile.py | 3 + cmk/gui/modules.py | 77 +++++-------- cmk/gui/notifications.py | 2 + cmk/gui/notify.py | 2 + cmk/gui/{plugins/pages/utils.py => pages.py} | 32 +++++- cmk/gui/pagetypes.py | 14 +-- .../plugins/{pages => main_modules}/__init__.py | 15 --- .../plugins/{pages/cron.py => main_modules/cre.py} | 31 +++++- cmk/gui/plugins/pages/bi.py | 36 ------- cmk/gui/plugins/pages/metrics.py | 32 ------ cmk/gui/plugins/pages/mobile.py | 33 ------ cmk/gui/plugins/pages/shipped.py | 119 --------------------- cmk/gui/plugins/pages/wato.py | 48 --------- cmk/gui/plugins/views/inventory.py | 2 + cmk/gui/prediction.py | 2 + cmk/gui/sidebar.py | 26 ++++- cmk/gui/userdb.py | 2 + cmk/gui/valuespec.py | 5 + cmk/gui/views.py | 14 +++ cmk/gui/visuals.py | 3 + cmk/gui/wato/__init__.py | 31 +++++- cmk/gui/webapi.py | 2 + cmk/gui/weblib.py | 4 + cmk/gui/werks.py | 3 + web/app/index.wsgi | 11 +- 35 files changed, 236 insertions(+), 366 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=08d666b976…

6 years, 2 months

Refactored builtin host tag declarations (resolving an import loop)

by Lars Michelsen

Module: check_mk Branch: master Commit: b31860dbb8cd715f02013e4b7a2435f9fd566da6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b31860dbb8cd71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Refactored builtin host tag declarations (resolving an import loop) Change-Id: I1737e6fabfd1467e5ce3ab8f2dfcd44e8193cd39 --- cmk/gui/config.py | 79 ++++++++++++++++++++++++++++++++++++++++---- cmk/gui/wato/__init__.py | 8 ++--- cmk/gui/watolib.py | 79 +++----------------------------------------- web/plugins/webapi/webapi.py | 4 +-- 4 files changed, 83 insertions(+), 87 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b31860dbb8…

6 years, 2 months

Cleaned up trailing newlines

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ed56b21065baf06c6f4ace8dca5708739c66379 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ed56b21065baf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 17:51:40 2018 +0200 Cleaned up trailing newlines Change-Id: I451aa8a361e4481afc5d3d7b6ff54b06c6e08570 --- cmk/gui/plugins/cron/gui_background_job.py | 1 - cmk/gui/plugins/sidebar/utils.py | 1 - 2 files changed, 2 deletions(-) diff --git a/cmk/gui/plugins/cron/gui_background_job.py b/cmk/gui/plugins/cron/gui_background_job.py index cd2f8b4..fd8cf10 100644 --- a/cmk/gui/plugins/cron/gui_background_job.py +++ b/cmk/gui/plugins/cron/gui_background_job.py @@ -36,4 +36,3 @@ def housekeeping(): cmk.gui.background_job.BackgroundJobManager(logger).do_housekeeping(housekeep_classes) register_job(housekeeping) - diff --git a/cmk/gui/plugins/sidebar/utils.py b/cmk/gui/plugins/sidebar/utils.py index f12a3ea..f09b268 100644 --- a/cmk/gui/plugins/sidebar/utils.py +++ b/cmk/gui/plugins/sidebar/utils.py @@ -207,4 +207,3 @@ def visuals_by_topic(permitted_visuals, default_order=None): result.append((topic, s)) return result -

6 years, 2 months

Enable cyclic import check

by Lars Michelsen

Module: check_mk Branch: master Commit: a3a5c06857c40b6489f73710707e2c69ebe89f3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3a5c06857c40b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Enable cyclic import check Change-Id: I766d37eb5e30002a46085298096d2b683b479718 --- tests/pylint/pylintrc | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 7c4d590..137ba98 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -26,7 +26,6 @@ disable= consider-iterating-dictionary, consider-using-enumerate, consider-using-ternary, - cyclic-import, duplicate-code, eval-used, exec-used,

6 years, 2 months

← Newer
1
...
26
27
28
29
30
31
32
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018