Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Made localization related things more explicit

by Lars Michelsen

Module: check_mk Branch: master Commit: ce5ca14d69ba32a0e6865615f9dda5ba46b267bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce5ca14d69ba32… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Made localization related things more explicit * Replaced all localization related __builtin__ variables _() -> cmk.gui.i18n._() _u() -> cmk.gui.i18n._u() current_language -> cmk.gui.i18n.get_current_language() All modules that use localized strings now first need to use the import "from i18n import _" to make the gettext localization function available. * Moved i18n module to cmk.gui.i18n Change-Id: Iefdc323145a1adb64698f17b278cd6d5e88ac5bd --- {web/htdocs => cmk/gui}/i18n.py | 120 +++++++++++++++------------ cmk/gui/plugins/sidebar/speedometer.py | 6 +- cmk/gui/plugins/sidebar/virtual_host_tree.py | 5 +- tests/pylint/pylintrc | 2 +- web/app/index.wsgi | 10 +-- web/htdocs/availability.py | 1 + web/htdocs/background_job.py | 1 + web/htdocs/backup.py | 1 + web/htdocs/bi.py | 6 +- web/htdocs/config.py | 3 +- web/htdocs/crash_reporting.py | 5 +- web/htdocs/cron.py | 5 +- web/htdocs/dashboard.py | 6 +- web/htdocs/default_permissions.py | 7 +- web/htdocs/forms.py | 1 + web/htdocs/gui_background_job.py | 6 +- web/htdocs/guitester.py | 1 + web/htdocs/hooks.py | 7 +- web/htdocs/htmllib.py | 1 + web/htdocs/http.py | 1 + web/htdocs/inventory.py | 1 + web/htdocs/key_mgmt.py | 1 + web/htdocs/log.py | 2 + web/htdocs/login.py | 9 +- web/htdocs/logwatch.py | 1 + web/htdocs/main.py | 1 + web/htdocs/metrics.py | 8 +- web/htdocs/mkeventd.py | 1 + web/htdocs/mobile.py | 1 + web/htdocs/multitar.py | 1 + web/htdocs/notifications.py | 6 +- web/htdocs/notify.py | 6 +- web/htdocs/pagetypes.py | 1 + web/htdocs/prediction.py | 1 + web/htdocs/sidebar.py | 6 +- web/htdocs/table.py | 1 + web/htdocs/userdb.py | 6 +- web/htdocs/valuespec.py | 1 + web/htdocs/views.py | 6 +- web/htdocs/visuals.py | 6 +- web/htdocs/wato.py | 17 ++-- web/htdocs/watolib.py | 1 + web/htdocs/webapi.py | 6 +- web/htdocs/weblib.py | 1 + web/htdocs/werks.py | 1 + web/plugins/sidebar/shipped.py | 1 + web/plugins/views/commands.py | 1 + web/plugins/wato/builtin_modules.py | 2 +- web/plugins/wato/check_mk_configuration.py | 2 +- 49 files changed, 185 insertions(+), 108 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ce5ca14d69…

6 years, 2 months

Add type checking for some cmk.gui modules

by Lars Michelsen

Module: check_mk Branch: master Commit: 2fba5a191f51aeb2fadb689ff22d571c9bc4c0ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fba5a191f51ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Add type checking for some cmk.gui modules * These checks are not executed yet because mypy is not able to deal with __builtin__.html. This will be cleaned up soon. Change-Id: I1f661e99ee15ce48bb4889ff1dc7c8c5e2920206 --- cmk/gui/exceptions.py | 28 ++++++++++++++++++++++------ cmk/gui/http_status.py | 1 + cmk/gui/i18n.py | 13 ++++++++++--- cmk/paths.py | 4 ++-- tests/static/Makefile | 3 ++- 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/cmk/gui/exceptions.py b/cmk/gui/exceptions.py index d1bf6b1..005d285 100644 --- a/cmk/gui/exceptions.py +++ b/cmk/gui/exceptions.py @@ -24,8 +24,10 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +from typing import Optional # pylint: disable=unused-import import cmk.gui.http_status +from cmk.gui.i18n import _ from cmk.exceptions import MKGeneralException, MKException @@ -41,8 +43,9 @@ class FinalizeRequest(Exception): """Is used to end the HTTP request processing from deeper code levels""" # TODO: Drop this default and make exit code explicit for all call sites def __init__(self, code = None): - super(FinalizeRequest, self).__init__(cmk.gui.http_status.status_with_reason(code)) - self.status = code or cmk.gui.http_status.HTTP_OK + # type: (Optional[int]) -> None + self.status = code or cmk.gui.http_status.HTTP_OK # type: int + super(FinalizeRequest, self).__init__(cmk.gui.http_status.status_with_reason(self.status)) @@ -50,69 +53,82 @@ class HTTPRedirect(FinalizeRequest): """Is used to end the HTTP request processing from deeper code levels and making the client request another page after receiving the response.""" def __init__(self, url, code=cmk.gui.http_status.HTTP_MOVED_TEMPORARILY): + # type: (str, int) -> None super(HTTPRedirect, self).__init__(code) if code not in [ cmk.gui.http_status.HTTP_MOVED_PERMANENTLY, cmk.gui.http_status.HTTP_MOVED_TEMPORARILY ]: raise Exception("Invalid status code: %d" % code) - self.url = url + self.url = url #type: str class MKAuthException(MKException): def __init__(self, reason): - self.reason = reason + # type: (str) -> None + self.reason = reason # type: str super(MKAuthException, self).__init__(reason) def __str__(self): + # type: () -> str return self.reason def title(self): + # type: () -> unicode return _("Permission denied") def plain_title(self): + # type: () -> unicode return _("Authentication error") class MKUnauthenticatedException(MKGeneralException): def title(self): + # type: () -> unicode return _("Not authenticated") def plain_title(self): + # type: () -> unicode return _("Missing authentication credentials") class MKConfigError(MKException): def title(self): + # type: () -> unicode return _("Configuration error") def plain_title(self): + # type: () -> unicode return self.title() class MKUserError(MKException): def __init__(self, varname, message): - self.varname = varname - self.message = message + # type: (str, str) -> None + self.varname = varname # type: str + self.message = message # type: str super(MKUserError, self).__init__(varname, message) def __str__(self): + # type: () -> str return self.message def title(self): + # type: () -> unicode return _("Invalid User Input") def plain_title(self): + # type: () -> unicode return _("User error") diff --git a/cmk/gui/http_status.py b/cmk/gui/http_status.py index 4a5dfac..2061f3c 100644 --- a/cmk/gui/http_status.py +++ b/cmk/gui/http_status.py @@ -77,6 +77,7 @@ HTTP_NOT_EXTENDED = 510 def status_with_reason(code): + # type: (int) -> str if code == HTTP_OK: return '200 OK' elif code == HTTP_MOVED_TEMPORARILY: diff --git a/cmk/gui/i18n.py b/cmk/gui/i18n.py index 704c4a5..3a95c32 100644 --- a/cmk/gui/i18n.py +++ b/cmk/gui/i18n.py @@ -27,7 +27,7 @@ import __builtin__ import os import gettext as gettext_module -from typing import NamedTuple, Optional, List +from typing import NamedTuple, Optional, List, Tuple import cmk.paths @@ -77,7 +77,7 @@ def get_language_alias(lang): alias = lang for lang_dir in _get_language_dirs(): try: - alias = file('%s/%s/alias' % (lang_dir, lang), 'r').read().strip() + alias = open('%s/%s/alias' % (lang_dir, lang), 'r').read().strip() except (OSError, IOError): pass return alias @@ -103,16 +103,19 @@ def get_languages(): def unlocalize(): + # type: () -> None global _translation _translation = None def localize(lang): + # type: (str) -> None set_language_cookie(lang) _do_localize(lang) def _do_localize(lang): + # type: (str) -> None global _translation if lang is None: unlocalize() @@ -127,9 +130,10 @@ def _do_localize(lang): def _init_language(lang): + # type: (str) -> Optional[gettext_module.NullTranslations] try: translation = gettext_module.translation("multisite", _get_cmk_locale_path(lang), - languages = [ lang ], codeset = 'UTF-8') + languages = [ lang ], codeset = 'UTF-8') # type: Optional[gettext_module.NullTranslations] except IOError, e: translation = None @@ -137,6 +141,7 @@ def _init_language(lang): def _get_cmk_locale_path(lang): + # type: (str) -> str po_path = '/%s/LC_MESSAGES/multisite.mo' % lang if os.path.exists(cmk.paths.local_locale_dir + po_path): return cmk.paths.local_locale_dir @@ -145,6 +150,7 @@ def _get_cmk_locale_path(lang): def initialize(): + # type: () -> None unlocalize() @@ -176,6 +182,7 @@ def set_language_cookie(lang): # Localization of user supplied texts def _u(text): + # type: (unicode) -> unicode # TODO: Reimplement this once config is available in "cmk.gui"! #import config #ldict = config.user_localizations.get(text) diff --git a/cmk/paths.py b/cmk/paths.py index f6fd948..bc7af77 100644 --- a/cmk/paths.py +++ b/cmk/paths.py @@ -89,7 +89,7 @@ mibs_dir = None web_dir = None pnp_templates_dir = None doc_dir = None -locale_dir = None +locale_dir = None # type: str bin_dir = None lib_dir = None mib_dir = None @@ -105,7 +105,7 @@ local_mibs_dir = None local_web_dir = None local_pnp_templates_dir = None local_doc_dir = None -local_locale_dir = None +local_locale_dir = None # type: str local_bin_dir = None local_lib_dir = None local_mib_dir = None diff --git a/tests/static/Makefile b/tests/static/Makefile index f8c6b28..5399e16 100644 --- a/tests/static/Makefile +++ b/tests/static/Makefile @@ -1,4 +1,5 @@ -FILES_TO_CHECK := $(realpath $(addprefix ../../cmk/ec/,defaults.py export.py settings.py)) +FILES_TO_CHECK := $(realpath $(addprefix ../../cmk/ec/,defaults.py export.py settings.py)) \ + $(realpath $(addprefix ../../cmk/gui/,http_status.py exceptions.py i18n.py)) MYPYPATH := $(realpath typeshed) PIPENV := PIPENV_NO_INHERIT=true PIPENV_VENV_IN_PROJECT=true pipenv

6 years, 2 months

Moved all web gui main modules to cmk.gui

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c8ef208eed65a986dc344517abc66ee6e14bbc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c8ef208eed65a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Moved all web gui main modules to cmk.gui The modules from share/check_mk/web/htdocs that have previously been imported by their simple file names and were only available after Python import path modifications have been moved to lib/python/cmk/gui. With this new path all files can be imported using "cmk.gui.[name]", e.g. "cmk.gui.views" from the whole site without path modification. The enterprise modules are available below "cmk.gui.cee" and the managed editions modules are available through "cmk.gui.cme". Additionally made former implicit always available HTML() now only available after explicit import like this: "from htmllib import HTML". Change-Id: I4797a8d7c3ed36abd08b7066ad7262659101c72b --- cmk/gui/.f12 | 5 + {web/htdocs => cmk/gui}/availability.py | 13 +- {web/htdocs => cmk/gui}/background_job.py | 8 +- {web/htdocs => cmk/gui}/backup.py | 11 +- {web/htdocs => cmk/gui}/bi.py | 7 +- cmk/gui/cee | 1 + cmk/gui/cme | 1 + {web/htdocs => cmk/gui}/config.py | 5 +- {web/htdocs => cmk/gui}/crash_reporting.py | 26 +- {web/htdocs => cmk/gui}/cron.py | 4 +- {web/htdocs => cmk/gui}/dashboard.py | 25 +- {web/htdocs => cmk/gui}/default_permissions.py | 2 +- {web/htdocs => cmk/gui}/forms.py | 2 +- {web/htdocs => cmk/gui}/gui_background_job.py | 20 +- {web/htdocs => cmk/gui}/help.py | 2 +- {web/htdocs => cmk/gui}/hooks.py | 3 +- {web/htdocs => cmk/gui}/htmllib.py | 12 +- {web/htdocs => cmk/gui}/http.py | 3 +- cmk/gui/i18n.py | 20 +- {web/htdocs => cmk/gui}/inventory.py | 13 +- {web/htdocs => cmk/gui}/key_mgmt.py | 6 +- {web/htdocs => cmk/gui}/log.py | 1 - {web/htdocs => cmk/gui}/login.py | 15 +- {web/htdocs => cmk/gui}/logwatch.py | 11 +- {web/htdocs => cmk/gui}/main.py | 6 +- {web/htdocs => cmk/gui}/md5crypt.py | 5 +- {web/htdocs => cmk/gui}/metrics.py | 34 +- {web/htdocs => cmk/gui}/mkeventd.py | 14 +- {web/htdocs => cmk/gui}/mobile.py | 7 +- {web/htdocs => cmk/gui}/modules.py | 29 +- {web/htdocs => cmk/gui}/multitar.py | 15 +- {web/htdocs => cmk/gui}/notifications.py | 12 +- {web/htdocs => cmk/gui}/notify.py | 13 +- {web/htdocs => cmk/gui}/pagetypes.py | 12 +- cmk/gui/plugins/sidebar/__init__.py | 2 + cmk/gui/plugins/sidebar/speedometer.py | 2 +- cmk/gui/plugins/sidebar/virtual_host_tree.py | 10 +- {web/htdocs => cmk/gui}/prediction.py | 11 +- {web/htdocs => cmk/gui}/sidebar.py | 20 +- {web/htdocs => cmk/gui}/sites.py | 4 +- {web/htdocs => cmk/gui}/table.py | 5 +- {web/htdocs => cmk/gui}/userdb.py | 23 +- {web/htdocs => cmk/gui}/utils.py | 0 {web/htdocs => cmk/gui}/valuespec.py | 18 +- {web/htdocs => cmk/gui}/views.py | 75 +++- {web/htdocs => cmk/gui}/visuals.py | 23 +- {web/htdocs => cmk/gui}/wato.py | 43 +-- {web/htdocs => cmk/gui}/watolib.py | 33 +- {web/htdocs => cmk/gui}/webapi.py | 14 +- {web/htdocs => cmk/gui}/weblib.py | 11 +- {web/htdocs => cmk/gui}/werks.py | 12 +- .../check_mk/skel/etc/check_mk/apache.conf | 5 - tests/pylint/pylintrc | 2 +- tests/pylint/test_pylint_misc.py | 6 + tests/pylint/test_pylint_web.py | 29 +- tests/unit/web/conftest.py | 60 +-- tests/unit/web/old/classes.py | 2 +- tests/unit/web/test_htmllib_TimeoutManager.py | 2 +- tests/unit/web/test_htmllib_TransactionManager.py | 2 +- tests/unit/web/test_http.py | 2 +- tests/unit/web/test_key_mgmt.py | 5 +- tests/unit/web/test_table.py | 6 +- web/app/index.wsgi | 38 +- web/htdocs/guitester.py | 404 --------------------- web/plugins/cron/gui_background_job.py | 8 +- web/plugins/cron/network_scan.py | 2 +- web/plugins/cron/user_sync.py | 2 +- web/plugins/dashboard/builtin.py | 2 +- web/plugins/dashboard/dashlets.py | 11 +- web/plugins/icons/mkeventd.py | 2 +- web/plugins/icons/wato.py | 2 +- web/plugins/metrics/check_mk.py | 2 +- web/plugins/pages/bi.py | 2 +- web/plugins/pages/cron.py | 4 +- web/plugins/pages/metrics.py | 2 +- web/plugins/pages/mobile.py | 2 +- web/plugins/pages/shipped.py | 42 +-- web/plugins/pages/wato.py | 2 +- web/plugins/perfometer/check_mk.py | 2 +- web/plugins/sidebar/bi.py | 2 +- web/plugins/sidebar/mkeventd.py | 2 +- web/plugins/sidebar/nagvis_maps.py | 4 +- web/plugins/sidebar/shipped.py | 19 +- web/plugins/sidebar/wato.py | 7 +- web/plugins/userdb/hook_auth.py | 2 +- web/plugins/userdb/htpasswd.py | 7 +- web/plugins/userdb/ldap.py | 8 +- web/plugins/views/availability.py | 8 +- web/plugins/views/bi.py | 2 +- web/plugins/views/commands.py | 4 +- web/plugins/views/inventory.py | 9 +- web/plugins/views/layouts.py | 2 +- web/plugins/views/mkeventd.py | 8 +- web/plugins/views/painters.py | 53 +-- web/plugins/views/perfometer.py | 6 +- web/plugins/views/sorters.py | 2 +- web/plugins/views/wato.py | 4 +- web/plugins/visuals/bi.py | 2 +- web/plugins/visuals/filters.py | 5 +- web/plugins/visuals/inventory.py | 4 +- web/plugins/visuals/mkeventd.py | 2 +- web/plugins/visuals/wato.py | 4 +- web/plugins/wato/bi.py | 5 +- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/mkeventd.py | 4 +- web/plugins/wato/omd_configuration.py | 4 +- 106 files changed, 590 insertions(+), 910 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7c8ef208ee…

6 years, 2 months

Use pylint's job feature.

by Sven Panne

Module: check_mk Branch: master Commit: 41be302606a7b08cb4ca41adbc2dc9f95a31d419 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41be302606a7b0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 08:37:27 2018 +0200 Use pylint's job feature. Change-Id: I8075d2c9ecd45a4a2dc45b9821e3675d1fa567a2 --- tests/testlib/pylint_cmk.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 6f3d524..486bcaf 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -4,6 +4,7 @@ import os import sys import glob +import multiprocessing import shutil import subprocess import tempfile @@ -54,6 +55,7 @@ def run_pylint(base_path, check_files=None): #, cleanup_test_dir=False): cmd = [ "python", "-m", "pylint", "--rcfile", pylint_cfg, + "--jobs=%d" % num_jobs_to_use(), ] + pylint_args + check_files os.putenv("TEST_PATH", repo_path() + "/tests") @@ -70,6 +72,13 @@ def run_pylint(base_path, check_files=None): #, cleanup_test_dir=False): return exit_code +def num_jobs_to_use(): + # Naive heuristic, but looks OK for our use cases: Normal quad core CPUs + # with HT report 8 CPUs (=> 6 jobs), our server 24-core CPU reports 48 CPUs + # (=> 11 jobs). Just using 0 (meaning: use all reported CPUs) might just + # work, too, but it's probably a bit too much. + return multiprocessing.cpu_count() / 8 + 5 + def get_pylint_files(base_path, file_pattern): files = []

6 years, 2 months

checktestlib: add Immutables object and assertEqual function

by Moritz Kiemer

Module: check_mk Branch: master Commit: e2b7944ef57592bbcaac59797ff02608b123377d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2b7944ef57592… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jul 5 14:23:20 2018 +0200 checktestlib: add Immutables object and assertEqual function Immutables: Register variables, and ensure they have not been tampered with (e.g. info variable after call to discovery function). assertEqual: Helper function to compare compound datatypes and better see their difference. Change-Id: I0fd627c928c66305d9eaadea67cd9ba5d252ef0e --- tests/unit/checks/checktestlib.py | 153 +++++++++++++++++++++++++++----------- 1 file changed, 109 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e2b7944ef5…

6 years, 2 months

mbg_lantime_ng_refclock: Add %s in service description

by Moritz Kiemer

Module: check_mk Branch: master Commit: 51e5f5377c0397772195ef5e73413d83a7836d00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51e5f5377c0397… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jul 12 13:45:53 2018 +0200 mbg_lantime_ng_refclock: Add %s in service description Change-Id: I57ac7f2b1b8f696b08b43d40b495361d9fef3d9d --- checks/mbg_lantime_ng_refclock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/mbg_lantime_ng_refclock b/checks/mbg_lantime_ng_refclock index c0577d5..ab8b0da 100644 --- a/checks/mbg_lantime_ng_refclock +++ b/checks/mbg_lantime_ng_refclock @@ -211,7 +211,7 @@ def check_lantime_ng_refclock_gps(item, params, info): check_info["mbg_lantime_ng_refclock.gps"] = { "check_function" : check_lantime_ng_refclock_gps, "inventory_function" : inventory_lantime_ng_refclock_gps, - "service_description" : "LANTIME Refclock", + "service_description" : "LANTIME Refclock %s", "has_perfdata" : True, } @@ -261,7 +261,7 @@ def check_lantime_ng_refclock(item, _no_params, info): check_info["mbg_lantime_ng_refclock"] = { "check_function" : check_lantime_ng_refclock, "inventory_function" : inventory_lantime_ng_refclock, - "service_description" : "LANTIME Refclock", + "service_description" : "LANTIME Refclock %s", "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.5597.30.0.1.2.1", [ 1, # MBG-SNMP-LTNG-MIB::mbgLtNgRefclockIndex

6 years, 2 months

Finally removed function based WATO modes and simplified WATO main page handler a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: ce6654f07bf33a6a24ccca479050f0f4c0a8ca8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce6654f07bf33a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:46:47 2018 +0200 Finally removed function based WATO modes and simplified WATO main page handler a bit Change-Id: I0f7be6885babf3927ba3053504fbc6704fa033b3 --- web/htdocs/wato.py | 96 +++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 55 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 30e43e4..2f33c42 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -241,7 +241,7 @@ def page_handler(): "the managers central site.")) current_mode = html.var("mode") or "main" - modeperms, modefunc = get_mode_function(current_mode) + mode_permissions, mode_class = get_mode_permission_and_class(current_mode) weblib.prepare_display_options(globals()) @@ -261,25 +261,11 @@ def page_handler(): else: raise - if modefunc == None: - html.header(_("Sorry"), stylesheets=wato_styles, - show_body_start=display_options.enabled(display_options.H), - show_top_heading=display_options.enabled(display_options.T)) - - if display_options.enabled(display_options.B): - html.begin_context_buttons() - home_button() - html.end_context_buttons() - - html.message(_("This module has not yet been implemented.")) - - html.footer(display_options.enabled(display_options.Z), - display_options.enabled(display_options.H)) - return - # Check general permission for this mode - if modeperms != None and not config.user.may("wato.seeall"): - ensure_mode_permissions(modeperms) + if mode_permissions != None and not config.user.may("wato.seeall"): + ensure_mode_permissions(mode_permissions) + + mode = mode_class() # Do actions (might switch mode) action_message = None @@ -290,13 +276,13 @@ def page_handler(): # Even if the user has seen this mode because auf "seeall", # he needs an explicit access permission for doing changes: if config.user.may("wato.seeall"): - if modeperms: - ensure_mode_permissions(modeperms) + if mode_permissions: + ensure_mode_permissions(mode_permissions) if watolib.is_read_only_mode_enabled() and not watolib.may_override_read_only_mode(): raise MKUserError(None, watolib.read_only_message()) - result = modefunc("action") + result = mode.action() if type(result) == tuple: newmode, action_message = result else: @@ -318,13 +304,14 @@ def page_handler(): html.close_div() html.footer() return - modeperms, modefunc = get_mode_function(newmode) + mode_permissions, mode_class = get_mode_permission_and_class(newmode) current_mode = newmode + mode = mode_class() html.set_var("mode", newmode) # will be used by makeuri # Check general permissions for the new mode - if modeperms != None and not config.user.may("wato.seeall"): - for pname in modeperms: + if mode_permissions != None and not config.user.may("wato.seeall"): + for pname in mode_permissions: if '.' not in pname: pname = "wato." + pname config.user.need_permission(pname) @@ -338,7 +325,7 @@ def page_handler(): html.add_user_error(None, e.reason) # Title - html.header(modefunc("title"), javascripts=["wato"], stylesheets=wato_styles, + html.header(mode.title(), javascripts=["wato"], stylesheets=wato_styles, show_body_start=display_options.enabled(display_options.H), show_top_heading=display_options.enabled(display_options.T)) html.open_div(class_="wato") @@ -347,7 +334,7 @@ def page_handler(): if display_options.enabled(display_options.B): # Show contexts buttons html.begin_context_buttons() - modefunc("buttons") + mode.buttons() for inmode, buttontext, target in extra_buttons: if inmode == current_mode: if hasattr(target, '__call__'): @@ -370,7 +357,7 @@ def page_handler(): html.message(action_message) # Show content - modefunc("content") + mode.handle_page() except MKGeneralException: raise @@ -397,23 +384,23 @@ def page_handler(): display_options.enabled(display_options.H)) -def get_mode_function(mode): - modeperms, modefunc = modes.get(mode, ([], None)) - if modefunc == None: - raise MKGeneralException(_("No such WATO module '<tt>%s</tt>'") % html.render_text(mode)) +def get_mode_permission_and_class(mode_name): + mode_permissions, mode_class = modes.get(mode_name, ([], ModeNotImplemented)) + if mode_class is None: + raise MKGeneralException(_("No such WATO module '<tt>%s</tt>'") % mode_name) - if type(modefunc) != type(lambda: None): - mode_class = modefunc - modefunc = mode_class.create_mode_function() + if type(mode_class) == type(lambda: None): + raise MKGeneralException(_("Deprecated WATO module: Implemented as function. " + "This needs to be refactored as WatoMode child class.")) - if modeperms != None and not config.user.may("wato.use"): + if mode_permissions != None and not config.user.may("wato.use"): raise MKAuthException(_("You are not allowed to use WATO.")) - return modeperms, modefunc + return mode_permissions, mode_class -def ensure_mode_permissions(modeperms): - for pname in modeperms: +def ensure_mode_permissions(mode_permissions): + for pname in mode_permissions: if '.' not in pname: pname = "wato." + pname config.user.need_permission(pname) @@ -431,21 +418,6 @@ class WatoMode(object): pass - @classmethod - def create_mode_function(cls): - mode_object = cls() - def mode_function(phase): - if phase == "title": - return mode_object.title() - elif phase == "buttons": - return mode_object.buttons() - elif phase == "action": - return mode_object.action() - else: - return mode_object.handle_page() - return mode_function - - def title(self): return _("(Untitled module)") @@ -459,7 +431,7 @@ class WatoMode(object): def page(self): - return _("(This module is not yet implemented)") + html.message(_("(This module is not yet implemented)")) def handle_page(self): @@ -488,6 +460,20 @@ class WatoWebApiMode(WatoMode): html.write(json.dumps(response)) + +class ModeNotImplemented(WatoMode): + def title(self): + return _("Sorry") + + + def buttons(self): + home_button() + + + def page(self): + html.show_error(_("This module has not yet been implemented.")) + + #. # .--Folders-------------------------------------------------------------. # | _____ _ _ |

6 years, 2 months

Refactored create/edit host/cluster modes to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: eb8345338d1e74302f71f19b795e02332ca0c0b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb8345338d1e74… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:46:27 2018 +0200 Refactored create/edit host/cluster modes to WatoMode Change-Id: I7e21f35910151dfbbd42a57653ed4f64b8870be4 --- web/htdocs/wato.py | 434 ++++++++++++++++++++++++++++---------------------- web/htdocs/watolib.py | 4 +- 2 files changed, 245 insertions(+), 193 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eb8345338d…

6 years, 2 months

Refactored notification rule edit mode to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ab596aa4c41a85beb9edc771c3069e202d2ac3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ab596aa4c41a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:46:38 2018 +0200 Refactored notification rule edit mode to WatoMode Change-Id: I96a78c13e4bcf93d578f7a7c8fd1c9dccf9220b7 --- web/htdocs/wato.py | 366 ++++++++++++++++++++++++++++++-------------------- web/htdocs/watolib.py | 4 +- 2 files changed, 224 insertions(+), 146 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0ab596aa4c…

6 years, 2 months

Refactored parentscan mode to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: 3471a2a9adfe701f3da697b39e7eacb88631aa64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3471a2a9adfe70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:46:33 2018 +0200 Refactored parentscan mode to WatoMode Change-Id: I167d540ea6f5f7700af9530d08a491300407a48c --- web/htdocs/wato.py | 395 +++++++++++++++++++++++++++-------------------------- 1 file changed, 201 insertions(+), 194 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3471a2a9ad…

6 years, 2 months

← Newer
1
...
30
31
32
33
34
35
36
...
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