Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Tests: Correctly using session scope site management

by Lars Michelsen

Module: check_mk Branch: master Commit: 0c132f87d2cb9715495be7d3595cee7261b63339 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c132f87d2cb97… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 1 14:44:05 2016 +0200 Tests: Correctly using session scope site management --- tests/conftest.py | 39 +++++++++++++++++++++++++++++++++++ tests/livestatus/test_livestatus.py | 2 +- tests/omd/test_python.py | 2 -- tests/testlib/__init__.py | 35 +------------------------------ tests/web/test_crawl.py | 2 +- tests/web/test_login.py | 2 +- tests/web/test_wato_webapi.py | 2 +- 7 files changed, 44 insertions(+), 40 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 0b7af07..bc8865b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,6 +3,8 @@ import os import sys import glob import pytest +import testlib + def cmk_path(): return os.path.dirname(os.path.dirname(__file__)) @@ -67,3 +69,40 @@ def pytest_runtest_setup(item): add_python_paths() ensure_equal_branches() + +import testlib + +# Session fixtures must be in conftest.py to work properly +(a)pytest.fixture(scope="session") +def site(request): + def site_id(): + site_id = os.environ.get("SITE") + if site_id == None: + site_id = file(testlib.repo_path() + "/.site").read().strip() + + return site_id + + def site_version(): + return os.environ.get("VERSION", testlib.CMKVersion.DEFAULT) + + def site_edition(): + return os.environ.get("EDITION", testlib.CMKVersion.CEE) + + def reuse_site(): + return os.environ.get("REUSE", "1") == "1" + + site = testlib.Site(site_id=site_id(), version=site_version(), + edition=site_edition(), reuse=reuse_site()) + site.cleanup_if_wrong_version() + site.create() + site.open_livestatus_tcp() + site.start() + site.prepare_for_tests() + + def fin(): + site.rm_if_not_reusing() + request.addfinalizer(fin) + + return site + + diff --git a/tests/livestatus/test_livestatus.py b/tests/livestatus/test_livestatus.py index 3d3cf1e6..670ad19 100644 --- a/tests/livestatus/test_livestatus.py +++ b/tests/livestatus/test_livestatus.py @@ -2,7 +2,7 @@ # encoding: utf-8 import pytest -from testlib import site, web +from testlib import web @pytest.fixture(scope="module") def default_cfg(web): diff --git a/tests/omd/test_python.py b/tests/omd/test_python.py index bcd06bb..918376f 100644 --- a/tests/omd/test_python.py +++ b/tests/omd/test_python.py @@ -5,8 +5,6 @@ import os import sys import subprocess -from testlib import site - def test_01_python_interpreter_exists(site): assert os.path.exists(site.root + "/bin/python") diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 5d4d544..e872bce 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -11,7 +11,6 @@ import requests import socket import pipes import subprocess -import livestatus try: import simplejson as json @@ -157,6 +156,7 @@ class Site(object): @property def live(self): + import livestatus live = livestatus.SingleSiteConnection("tcp:127.0.0.1:%d" % self.livestatus_port) live.set_timeout(2) @@ -275,39 +275,6 @@ class Site(object): -(a)pytest.fixture(scope="session") -def site(request): - def site_id(): - site_id = os.environ.get("SITE") - if site_id == None: - site_id = file(repo_path() + "/.site").read().strip() - - return site_id - - def site_version(): - return os.environ.get("VERSION", CMKVersion.DEFAULT) - - def site_edition(): - return os.environ.get("EDITION", CMKVersion.CEE) - - def reuse_site(): - return os.environ.get("REUSE", "1") == "1" - - site = Site(site_id=site_id(), version=site_version(), - edition=site_edition(), reuse=reuse_site()) - site.cleanup_if_wrong_version() - site.create() - site.open_livestatus_tcp() - site.start() - site.prepare_for_tests() - - def fin(): - site.rm_if_not_reusing() - request.addfinalizer(fin) - - return site - - class WebSession(requests.Session): transids = {} diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 6cf01c9..4c615b8 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -13,7 +13,7 @@ import traceback from urlparse import urlsplit, parse_qsl, urlunsplit, urljoin from urllib import urlencode from bs4 import BeautifulSoup -from testlib import site, web, var_dir, WebSession +from testlib import web, var_dir, WebSession class Url(object): diff --git a/tests/web/test_login.py b/tests/web/test_login.py index 9804dee..c995ab0 100644 --- a/tests/web/test_login.py +++ b/tests/web/test_login.py @@ -2,7 +2,7 @@ # encoding: utf-8 import pytest -from testlib import site, WebSession +from testlib import WebSession def test_01_login_and_logout(site): web = WebSession(site) diff --git a/tests/web/test_wato_webapi.py b/tests/web/test_wato_webapi.py index 207ad31..82b2884 100644 --- a/tests/web/test_wato_webapi.py +++ b/tests/web/test_wato_webapi.py @@ -2,7 +2,7 @@ # encoding: utf-8 import pytest -from testlib import site, web +from testlib import web def test_global_settings(site, web): r = web.get(site.url + "wato.py")

8 years, 1 month

CI: Set site not to be reused

by Lars Michelsen

Module: check_mk Branch: master Commit: 843aefd6f6aba7fb4ddc49d387c1f8585718d080 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=843aefd6f6aba7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 1 14:21:17 2016 +0200 CI: Set site not to be reused --- tests/testlib/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 2f21681..5d4d544 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -290,8 +290,11 @@ def site(request): def site_edition(): return os.environ.get("EDITION", CMKVersion.CEE) + def reuse_site(): + return os.environ.get("REUSE", "1") == "1" + site = Site(site_id=site_id(), version=site_version(), - edition=site_edition()) + edition=site_edition(), reuse=reuse_site()) site.cleanup_if_wrong_version() site.create() site.open_livestatus_tcp()

8 years, 1 month

3730 FIX Improved GUI performance in case of different languages used by users

by Lars Michelsen

Module: check_mk Branch: master Commit: c1f6dbf27dfef09e21a9e8f0b77d0125d5dd3f88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1f6dbf27dfef0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 1 14:03:09 2016 +0200 3730 FIX Improved GUI performance in case of different languages used by users In case there are users using different languages in the GUI, the interface could load slower since the GUI needs to re-initialize different code parts (multisite plugins) each time a user with a different language accesses the GUI. In technical detail: Each apache process has one Python interpreter which serves the Check_MK GUI. Once a request arrives, the whole GUI code is loaded in the language of the user. This loaded GUI is cached until a user with another language requests a page from this apache process. The cache needs to be renewed then. This takes a lot longer than simply using the cache. We have now improved the situation by routing the requests to language dependent, so called, sub interpreters. Each apache process can now have a default language (english) interpreter and an e.g. German language sub interpreter which each have caches on their own and thus never need to reinitialze their cached GUI now. --- .werks/3730 | 22 ++++++++++++++++++++++ ChangeLog | 1 + web/htdocs/i18n.py | 16 ++++++++++++++++ web/htdocs/login.py | 2 ++ web/htdocs/wato.py | 1 + 5 files changed, 42 insertions(+) diff --git a/.werks/3730 b/.werks/3730 new file mode 100644 index 0000000..c9dd425 --- /dev/null +++ b/.werks/3730 @@ -0,0 +1,22 @@ +Title: Improved GUI performance in case of different languages used by users +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1470052655 +Class: fix + +In case there are users using different languages in the GUI, the interface could load +slower since the GUI needs to re-initialize different code parts (multisite plugins) each +time a user with a different language accesses the GUI. + +In technical detail: Each apache process has one Python interpreter which serves the +Check_MK GUI. Once a request arrives, the whole GUI code is loaded in the language +of the user. This loaded GUI is cached until a user with another language requests +a page from this apache process. The cache needs to be renewed then. This takes a +lot longer than simply using the cache. + +We have now improved the situation by routing the requests to language dependent, +so called, sub interpreters. Each apache process can now have a default language +(english) interpreter and an e.g. German language sub interpreter which each have +caches on their own and thus never need to reinitialze their cached GUI now. diff --git a/ChangeLog b/ChangeLog index a7f4336..e7b428f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -412,6 +412,7 @@ * 3723 FIX: Mobile GUI: Don't mix classic and mobile GUI when choosing classic on mobile device * 3645 FIX: Fixed filesystem growth/shrinkage graph by splitting it up into 2 graphs. * 3729 FIX: Disabling password field completion for most forms, even in current Chrome + * 3730 FIX: Improved GUI performance in case of different languages used by users... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/i18n.py b/web/htdocs/i18n.py index e1a3c6e..6989966 100644 --- a/web/htdocs/i18n.py +++ b/web/htdocs/i18n.py @@ -115,6 +115,8 @@ def unlocalize(): def localize(lang, **kwargs): + set_language_cookie(lang) + if lang: # FIXME: Clean this up. Make the other code access the current language through a # function of this module. @@ -133,6 +135,20 @@ def initialize(): __builtin__._u = _u unlocalize() + +def del_language_cookie(): + html.del_cookie("language") + + +def set_language_cookie(lang): + cookie_lang = html.cookie("language", None) + if cookie_lang != lang: + if lang != None: + html.set_cookie("language", lang) + else: + del_language_cookie() + + #. # .--User i18n-----------------------------------------------------------. # | _ _ _ _ ___ | diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 43eb7bd..cefa910 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -29,6 +29,7 @@ from lib import * from html_mod_python import FinalizeRequest import os, time import traceback +import i18n try: from hashlib import md5 @@ -112,6 +113,7 @@ def invalidate_auth_session(): userdb.invalidate_session(config.user_id) del_auth_cookie() + i18n.del_language_cookie() def renew_auth_session(username): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fdc1949..888bcc0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13892,6 +13892,7 @@ def page_user_profile(change_pw=False): # Set custom language users[config.user_id]['language'] = language config.user['language'] = language + i18n.set_language_cookie(language) else: # Remove the customized language

8 years, 1 month

Small improvement of pending changes button

by Lars Michelsen

Module: check_mk Branch: master Commit: ad66c979b74fbcb9acc8f6088d80bce4c76fbbc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad66c979b74fbc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 1 11:25:16 2016 +0200 Small improvement of pending changes button --- web/htdocs/wato.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5f7e261..fdc1949 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15981,12 +15981,18 @@ def home_button(): def changelog_button(): pending = parse_audit_log("pending") - if len(pending) > 0: - buttontext = "%d " % len(pending) + _("Changes") + num_pending = len(pending) + if num_pending >= 1: hot = True icon = "wato_changes" + + if num_pending == 1: + buttontext = _("1 change") + else: + buttontext = _("%d changes") % num_pending + else: - buttontext = _("No Changes") + buttontext = _("No changes") hot = False icon = "wato_nochanges" html.context_button(buttontext, folder_preserving_link([("mode", "changelog")]), icon, hot)

8 years, 1 month

3729 FIX Disabling password field completion for most forms,

by Lars Michelsen

even in current Chrome Message-ID: <579f11d7.y6tV1gye/ZsLjl2E%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 65648d2bd3f6b748b0cb590400e879f12d90f8cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65648d2bd3f6b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 1 11:09:38 2016 +0200 3729 FIX Disabling password field completion for most forms, even in current Chrome --- .werks/3729 | 9 +++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 11 ++++++++++- web/htdocs/wato.py | 10 +++++----- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.werks/3729 b/.werks/3729 new file mode 100644 index 0000000..e4598f3 --- /dev/null +++ b/.werks/3729 @@ -0,0 +1,9 @@ +Title: Disabling password field completion for most forms, even in current Chrome +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1470042544 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9646aaf..a7f4336 100644 --- a/ChangeLog +++ b/ChangeLog @@ -411,6 +411,7 @@ * 3722 FIX: Mobile GUI: Prevent it from being opened with regular sidebar * 3723 FIX: Mobile GUI: Don't mix classic and mobile GUI when choosing classic on mobile device * 3645 FIX: Fixed filesystem growth/shrinkage graph by splitting it up into 2 graphs. + * 3729 FIX: Disabling password field completion for most forms, even in current Chrome WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1f9096c..8181c8b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3347,6 +3347,7 @@ class LDAPDistinguishedName(TextUnicode): class Password(TextAscii): def __init__(self, **kwargs): self._is_stored_plain = kwargs.get("is_stored_plain", True) + self._autocomplete = kwargs.get("autocomplete", False) if self._is_stored_plain: plain_help = _("The password entered here is stored in plain text within the " @@ -3368,7 +3369,15 @@ class Password(TextAscii): if self._label: html.write(self._label) html.write(" ") - html.password_input(varprefix, str(value), size = self._size) + + kwargs = { + "size": self._size, + } + + if self._autocomplete == False: + kwargs["autocomplete"] = "new-password" + + html.password_input(varprefix, str(value), **kwargs) if self._is_stored_plain: html.write("<span>%s</span>" % _("Please note that this password is stored in plain " "text.")) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ff32bd1..5f7e261 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10417,9 +10417,9 @@ def mode_edit_user(phase): _("Normal user login with password")) html.write("<ul><table><tr><td>%s</td><td>" % _("password:")) if not is_locked('password'): - html.password_input("password_" + pw_suffix, autocomplete="off") + html.password_input("password_" + pw_suffix, autocomplete="new-password") html.write("</td></tr><tr><td>%s</td><td>" % _("repeat:")) - html.password_input("password2_" + pw_suffix, autocomplete="off") + html.password_input("password2_" + pw_suffix, autocomplete="new-password") html.write(" (%s)" % _("optional")) html.write("</td></tr><tr><td>%s:</td><td>" % _("Enforce change")) # Only make password enforcement selection possible when user is allowed to change the PW @@ -14038,13 +14038,13 @@ def page_user_profile(change_pw=False): if config.may('general.change_password') and not is_locked('password'): forms.section(_("Current Password")) - html.password_input('cur_password', autocomplete = "off") + html.password_input('cur_password', autocomplete="new-password") forms.section(_("New Password")) - html.password_input('password', autocomplete = "off") + html.password_input('password', autocomplete="new-password") forms.section(_("New Password Confirmation")) - html.password_input('password2', autocomplete = "off") + html.password_input('password2', autocomplete="new-password") if not change_pw and config.may('general.edit_profile'): select_language(user)

8 years, 1 month

Adding pending changes when editing passwords

by Lars Michelsen

Module: check_mk Branch: master Commit: ea56f70d26b73e2337e06aec4e66004d657990c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea56f70d26b73e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 1 10:58:05 2016 +0200 Adding pending changes when editing passwords --- web/htdocs/wato.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index feb30a3..ff32bd1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15266,6 +15266,8 @@ class ModePasswords(WatoMode, PasswordStore): if ident not in passwords: raise MKUserError("ident", _("This password does not exist.")) + log_pending(SYNCRESTART, ident, "delete-password", + _("Removed the password '%s'") % ident) del passwords[ident] self._save(passwords) @@ -15449,6 +15451,13 @@ class ModeEditPassword(WatoMode, PasswordStore): passwords[self._ident] = self._cfg + if self._new: + log_pending(SYNCRESTART, self._ident, "add-host", + _("Added the password '%s'") % self._ident) + else: + log_pending(SYNCRESTART, self._ident, "edit-password", + _("Edited the password '%s'") % self._ident) + self._save(passwords) return "passwords"

8 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016