Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Óscar Nájera

Module: check_mk Branch: master Commit: 70c7fc8827b0756e65c34c4e34c4908cb3b7dee7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70c7fc8827b075… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 14:00:03 2018 +0100 Yapf to cmk/gui/plugins/views/icons CMK-1180 Change-Id: I1b5ef5546a1141bf0ebc0b118d7284edd974bbae --- cmk/gui/plugins/views/icons/__init__.py | 60 ++++--- cmk/gui/plugins/views/icons/builtin.py | 281 +++++++++++++++++++------------ cmk/gui/plugins/views/icons/inventory.py | 9 +- cmk/gui/plugins/views/icons/mkeventd.py | 20 ++- cmk/gui/plugins/views/icons/wato.py | 27 +-- 5 files changed, 235 insertions(+), 162 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=70c7fc8827…

5 years, 7 months

Automatic yapf cmk/gui/plugins/userdb including i18n lines

by Óscar Nájera

Module: check_mk Branch: master Commit: 3ac1e959f93592e724dca024a31ed5c31d383ad3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ac1e959f93592… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 12:06:56 2018 +0100 Automatic yapf cmk/gui/plugins/userdb including i18n lines CMK-1180 Change-Id: I5a9cef4ffd50b8e3d617c34fa0127138049a7dd6 --- cmk/gui/plugins/userdb/__init__.py | 2 - cmk/gui/plugins/userdb/ldap_connector.py | 1179 ++++++++++++++++------------- cmk/gui/plugins/userdb/user_attributes.py | 118 +-- cmk/gui/plugins/userdb/utils.py | 1 + 4 files changed, 722 insertions(+), 578 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3ac1e959f9…

5 years, 7 months

Semi-Automatic Fix for typechecks in cmk/gui/plugins/userdb

by Óscar Nájera

Module: check_mk Branch: master Commit: 07530c20123a5d4d43f3e17e8541e12cfaca6f05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07530c20123a5d… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 12:12:56 2018 +0100 Semi-Automatic Fix for typechecks in cmk/gui/plugins/userdb CMK-837 Change-Id: I49e913fb26694ac946a7d9625d2c6fc517efd289 --- cmk/gui/plugins/userdb/ldap_connector.py | 41 ++++++++++++++++++------------- cmk/gui/plugins/userdb/user_attributes.py | 2 +- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 38b0dba..9f074b8 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -54,6 +54,13 @@ import copy import sys import shutil +try: + # does not exist in Py3, but is supper class of str & unicode in py2 + basestring +except NameError: + basestring = str # pylint: disable=redefined-builtin + unicode = str # pylint: disable=redefined-builtin + # docs: http://www.python-ldap.org/doc/html/index.html import ldap import ldap.filter @@ -164,7 +171,7 @@ class LDAPUserConnector(UserConnector): # For a short time in git master the directory_type could be: # ('ad', {'discover_nearest_dc': True/False}) - if type(config["directory_type"]) == tuple and config["directory_type"][0] == "ad" \ + if isinstance(config["directory_type"], tuple) and config["directory_type"][0] == "ad" \ and "discover_nearest_dc" in config["directory_type"][1]: auto_discover = config["directory_type"][1]["discover_nearest_dc"] @@ -177,7 +184,7 @@ class LDAPUserConnector(UserConnector): }), }) - if type(config["directory_type"]) != tuple and "server" in config: + if not isinstance(config["directory_type"], tuple) and "server" in config: # Old separate configuration of directory_type and server servers = { "server": config["server"], @@ -267,7 +274,7 @@ class LDAPUserConnector(UserConnector): except (ldap.SERVER_DOWN, ldap.TIMEOUT, ldap.LOCAL_ERROR, ldap.LDAPError), e: self.clear_nearest_dc_cache() - if type(e[0]) == dict: + if isinstance(e[0], dict): msg = e[0].get('info', e[0].get('desc', '')) else: msg = "%s" % e @@ -531,10 +538,10 @@ class LDAPUserConnector(UserConnector): lc = SimplePagedResultsControl(size=page_size, cookie='') - if type(base) == unicode: + if isinstance(base, unicode): base = base.encode("utf-8") - if type(filt) == unicode: + if isinstance(filt, unicode): filt = filt.encode("utf-8") results = [] @@ -566,7 +573,7 @@ class LDAPUserConnector(UserConnector): columns=None, scope='sub', implicit_connect=True): - if columns == None: + if columns is None: columns = [] self._logger.info('LDAP_SEARCH "%s" "%s" "%s" "%r"' % (base, scope, filt, columns)) @@ -1266,7 +1273,7 @@ class LDAPUserConnector(UserConnector): for key in keys: value = user[key] new_value = new_user[key] - if type(value) == list and type(new_value) == list: + if isinstance(value, list) and isinstance(new_value, list): is_changed = sorted(value) != sorted(new_value) else: is_changed = value != new_value @@ -1299,7 +1306,7 @@ class LDAPUserConnector(UserConnector): def is_enabled(self): import cmk.gui.userdb as userdb # TODO: Cleanup sync_config = userdb.user_sync_config() - if type(sync_config) == tuple and self.id() not in sync_config[1]: + if isinstance(sync_config, tuple) and self.id() not in sync_config[1]: #self._ldap_logger('Skipping disabled connection %s' % (self.id())) return False return True @@ -1322,7 +1329,7 @@ class LDAPUserConnector(UserConnector): locked = set(['password']) # This attributes are locked in all cases! for key, params in self._config['active_plugins'].items(): lock_attrs = ldap_attribute_plugins.get(key, {}).get('lock_attributes', []) - if type(lock_attrs) == list: + if isinstance(lock_attrs, list): locked.update(lock_attrs) else: # maby be a function which returns a list locked.update(lock_attrs(params)) @@ -1816,7 +1823,7 @@ class LDAPConnectionValuespec(Transform): for index, group_spec in enumerate(group_specs): dn, connection_id = group_spec - if connection_id == None: + if connection_id is None: group_dn = value["group_dn"] else: @@ -2431,13 +2438,13 @@ def ldap_sync_groups_to_roles(connection, plugin, params, user_id, ldap_user, us # Loop all roles mentioned in params (configured to be synchronized) for role_id, group_specs in params.items(): - if type(group_specs) != list: + if not isinstance(group_specs, list): group_specs = [group_specs] # be compatible to old single group configs for group_spec in group_specs: - if type(group_spec) in [str, unicode]: + if isinstance(group_spec, basestring): dn = group_spec # be compatible to old config without connection spec - elif type(group_spec) != tuple: + elif not isinstance(group_spec, tuple): continue # skip non configured ones (old valuespecs allowed None) else: dn = group_spec[0] @@ -2473,11 +2480,11 @@ def fetch_needed_groups_for_groups_to_roles(connection, params): def _get_groups_to_fetch(connection, params): groups_to_fetch = {} for group_specs in params.itervalues(): - if type(group_specs) == list: + if isinstance(group_specs, list): for group_spec in group_specs: - if type(group_spec) == tuple: + if isinstance(group_spec, tuple): this_conn_id = group_spec[1] - if this_conn_id == None: + if this_conn_id is None: this_conn_id = connection.id() groups_to_fetch.setdefault(this_conn_id, []) groups_to_fetch[this_conn_id].append(group_spec[0].lower()) @@ -2487,7 +2494,7 @@ def _get_groups_to_fetch(connection, params): groups_to_fetch.setdefault(this_conn_id, []) groups_to_fetch[this_conn_id].append(group_spec.lower()) - elif type(group_specs) in [str, unicode]: + elif isinstance(group_specs, basestring): # Need to be compatible to old config formats this_conn_id = connection.id() groups_to_fetch.setdefault(this_conn_id, []) diff --git a/cmk/gui/plugins/userdb/user_attributes.py b/cmk/gui/plugins/userdb/user_attributes.py index 487815f..b14400d 100644 --- a/cmk/gui/plugins/userdb/user_attributes.py +++ b/cmk/gui/plugins/userdb/user_attributes.py @@ -125,7 +125,7 @@ class DisableNotificationsUserAttribute(UserAttribute): forth=self._transform_disable_notification) def _transform_disable_notification(self, p): - if type(p) is not dict: + if not isinstance(p, dict): return {"disable": True} return p

5 years, 7 months

Delete superfluous duplicated entry

by Óscar Nájera

Module: check_mk Branch: master Commit: 172c9d6be3dd30eabc55955a09a89f4c58d27614 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=172c9d6be3dd30… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 16:41:26 2018 +0100 Delete superfluous duplicated entry Change-Id: Idf64a32a8d33e82046bc6decbf5bc3541d37e052 --- cmk/gui/plugins/metrics/check_mk.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 9f03a13..e65c211 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -6554,12 +6554,6 @@ check_metrics["check_mk-cisco_mem_asa64"] = { }, } -check_metrics["check_mk-cisco_mem_asa64"] = { - "mem_used": { - "name": "mem_used_percent" - }, -} - check_metrics["check_mk-fortigate_sessions_base"] = { "session": { "name": "active_sessions"

5 years, 7 months

Yapf cmk/gui/plugins/{config, cron, main_modules, metrics}

by Óscar Nájera

Module: check_mk Branch: master Commit: 6a54b82a19d919a10d75ee940643fee1013ebdc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a54b82a19d919… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 16:00:10 2018 +0100 Yapf cmk/gui/plugins/{config,cron,main_modules,metrics} CMK-1180 Change-Id: I80434077d3a48ac8d48d55a6e7d475c49815409c --- cmk/gui/plugins/config/base.py | 289 +- cmk/gui/plugins/cron/__init__.py | 2 +- cmk/gui/plugins/cron/gui_background_job.py | 2 + cmk/gui/plugins/main_modules/cre.py | 1 - cmk/gui/plugins/metrics/check_mk.py | 9445 +++++++++++++++------------- cmk/gui/plugins/metrics/utils.py | 275 +- 6 files changed, 5532 insertions(+), 4482 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6a54b82a19…

5 years, 7 months

Yapf to cmk/gui/plugins/views/performeters

by Óscar Nájera

Module: check_mk Branch: master Commit: 950e99989e54f7cb229452ef475c14cbc87dca99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=950e99989e54f7… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 14:05:30 2018 +0100 Yapf to cmk/gui/plugins/views/performeters CMK-1180 Change-Id: I146f6a0c2f8ffc33142792bf054fb7e8444cb558 --- cmk/gui/plugins/views/perfometers/__init__.py | 48 ++- cmk/gui/plugins/views/perfometers/active_checks.py | 8 +- cmk/gui/plugins/views/perfometers/check_mk.py | 479 ++++++++++++++------- 3 files changed, 347 insertions(+), 188 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=950e99989e…

5 years, 7 months

Fixed disabling checkboxes after htmllib refactoring in 1.6 code base

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d7f0951414d0214d955f4fd44632191df876c25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d7f0951414d02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 1 20:38:43 2018 +0100 Fixed disabling checkboxes after htmllib refactoring in 1.6 code base Change-Id: Icf4df4c656b19e20da6e6023e26879ed75407a60 --- cmk/gui/plugins/wato/utils/__init__.py | 6 +++--- cmk/gui/wato/pages/services.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index e58a91c..a0d77cd 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -1522,13 +1522,13 @@ def configure_attributes(new, checkbox_code = None elif force_entry: checkbox_code = html.render_checkbox( - "ignored_" + checkbox_name, add_attr=["disabled"]) + "ignored_" + checkbox_name, disabled="disabled") checkbox_code += html.render_hidden_field(checkbox_name, "on") else: - add_attr = ["disabled"] if disabled else [] onclick = "wato_fix_visibility(); wato_toggle_attribute(this, '%s');" % attrname + checkbox_kwargs = {"disabled": "disabled"} if disabled else {} checkbox_code = html.render_checkbox( - checkbox_name, active, onclick=onclick, add_attr=add_attr) + checkbox_name, active, onclick=onclick, **checkbox_kwargs) forms.section(_u(attr.title()), checkbox=checkbox_code, section_id="attr_" + attrname) html.help(attr.help()) diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index faabd2a..df9d2a3 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -578,7 +578,7 @@ class ModeDiscovery(WatoMode): sortable=False, css="checkbox") html.checkbox(self._checkbox_name(check_type, item), - True, add_attr = ['title="%s"' % _('Temporarily ignore this service')]) + True, title=_("Temporarily ignore this service")) def _bulk_action_colspan(self): colspan = 5

5 years, 7 months

Reduced duplicate code

by Lars Michelsen

Module: check_mk Branch: master Commit: a7a5444502652a90aa4ec4aa208ed62a2d2a7b6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7a5444502652a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 30 22:29:58 2018 +0100 Reduced duplicate code Change-Id: I6d36353bf5faa824e83472002e92ddd9af01bffa --- cmk/utils.py | 20 ++++++++++++++++++++ cmk_base/config.py | 19 ++----------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/cmk/utils.py b/cmk/utils.py index a6ee467..4d4477a 100644 --- a/cmk/utils.py +++ b/cmk/utils.py @@ -48,3 +48,23 @@ def pnp_cleanup(s): .replace(':', '_') \ .replace('/', '_') \ .replace('\\', '_') + + +def cmp_config_paths(a, b): + """Compare function for Check_MK configuration file paths + + Helper functions that determines the sort order of the + configuration files. The following two rules are implemented: + + 1. *.mk files in the same directory will be read + according to their lexical order. + 2. subdirectories in the same directory will be + scanned according to their lexical order. + 3. subdirectories of a directory will always be read *after* + the *.mk files in that directory. + """ + pa = a.split('/') + pb = b.split('/') + return cmp(pa[:-1], pb[:-1]) or \ + cmp(len(pa), len(pb)) or \ + cmp(pa, pb) diff --git a/cmk_base/config.py b/cmk_base/config.py index 96233f5..2c2d402 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -47,6 +47,7 @@ import cmk.paths from cmk.regex import regex, is_regex import cmk.translations import cmk.store as store +import cmk.utils from cmk.exceptions import MKGeneralException, MKTerminate import cmk_base @@ -271,7 +272,7 @@ def _get_config_file_paths(with_conf_d): for f in fs if f.endswith(".mk")] for d, _unused_sb, fs in os.walk(cmk.paths.check_mk_config_dir)], []), - cmp=_cmp_config_paths) + cmp=cmk.utils.cmp_config_paths) list_of_files = [cmk.paths.main_config_file] + list_of_files else: list_of_files = [cmk.paths.main_config_file] @@ -420,22 +421,6 @@ def all_nonfunction_vars(): ]) -# Helper functions that determines the sort order of the -# configuration files. The following two rules are implemented: -# 1. *.mk files in the same directory will be read -# according to their lexical order. -# 2. subdirectories in the same directory will be -# scanned according to their lexical order. -# 3. subdirectories of a directory will always be read *after* -# the *.mk files in that directory. -def _cmp_config_paths(a, b): - pa = a.split('/') - pb = b.split('/') - return cmp(pa[:-1], pb[:-1]) or \ - cmp(len(pa), len(pb)) or \ - cmp(pa, pb) - - class PackedConfig(object): """The precompiled host checks and the CMC Check_MK helpers use a "precompiled" part of the Check_MK configuration during runtime.

5 years, 7 months

Add context manager for PID file locking

by Lars Michelsen

Module: check_mk Branch: master Commit: 91cc92e7eee858c6aedaef614772ceaad69fd5c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91cc92e7eee858… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 5 08:42:10 2018 +0100 Add context manager for PID file locking * Added tests to verify PID locking mechanism Change-Id: Id8c69cf894e6c1b34b76798af76882c97a1e4c6d --- cmk/daemon.py | 32 +++++++++++++++++++++++- tests/unit/cmk/test_daemon.py | 58 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/cmk/daemon.py b/cmk/daemon.py index aac0e95..20faeb9 100644 --- a/cmk/daemon.py +++ b/cmk/daemon.py @@ -30,9 +30,11 @@ from pwd import getpwnam from grp import getgrnam import ctypes import ctypes.util +from pathlib2 import Path # pylint: disable=unused-import +from contextlib import contextmanager import cmk.store -from .exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException def daemonize(user=0, group=0): @@ -99,7 +101,9 @@ def closefrom(lowfd): os.closerange(lowfd, highfd) +# TODO: Change API and call sites to work with Path() objects def lock_with_pid_file(path): + # type: (str) -> None """ Use this after daemonizing or in foreground mode to ensure there is only one process running. @@ -114,6 +118,32 @@ def lock_with_pid_file(path): f.write("%d\n" % os.getpid()) +# TODO: Change API and call sites to work with Path() objects +def _cleanup_locked_pid_file(path): + # type: (str) -> None + """Cleanup the lock + file acquired by the function above""" + if not cmk.store.have_lock(path): + return + + cmk.store.release_lock(path) + + try: + os.remove(path) + except OSError: + pass + + +@contextmanager +def pid_file_lock(path): + # type: (Path) -> None + """Context manager for PID file based locking""" + lock_with_pid_file("%s" % path) + try: + yield + finally: + _cleanup_locked_pid_file("%s" % path) + + def set_cmdline(cmdline): """ Change the process name and process command line on of the running process diff --git a/tests/unit/cmk/test_daemon.py b/tests/unit/cmk/test_daemon.py new file mode 100644 index 0000000..7ca5599 --- /dev/null +++ b/tests/unit/cmk/test_daemon.py @@ -0,0 +1,58 @@ +import pytest +from pathlib2 import Path +import os + +import cmk.store as store +import cmk.daemon as daemon +from cmk.exceptions import MKGeneralException + +(a)pytest.fixture(autouse=True) +def cleanup_locks(): + yield + store.release_all_locks() + + +def test_lock_with_pid_file(tmpdir): + pid_file = Path(tmpdir) / "test.pid" + + daemon.lock_with_pid_file("%s" % pid_file) + + assert store.have_lock("%s" % pid_file) + + with pid_file.open() as f: + assert int(f.read()) == os.getpid() + + +def test_cleanup_locked_pid_file(tmpdir): + pid_file = Path(tmpdir) / "test.pid" + + assert not store.have_lock("%s" % pid_file) + daemon.lock_with_pid_file("%s" % pid_file) + assert store.have_lock("%s" % pid_file) + + daemon._cleanup_locked_pid_file("%s" % pid_file) + + assert not store.have_lock("%s" % pid_file) + + +def test_pid_file_lock_context_manager(tmpdir): + pid_file = Path(tmpdir) / "test.pid" + + assert not store.have_lock("%s" % pid_file) + + with daemon.pid_file_lock(pid_file): + assert store.have_lock("%s" % pid_file) + + +def test_pid_file_lock_context_manager_exception(tmpdir): + pid_file = Path(tmpdir) / "test.pid" + + assert not store.have_lock("%s" % pid_file) + try: + with daemon.pid_file_lock(pid_file): + assert store.have_lock("%s" % pid_file) + raise MKGeneralException("bla") + except MKGeneralException: + pass + + assert not store.have_lock("%s" % pid_file)

5 years, 7 months

Moved cmk.gui.plugin_registry to cmk.plugin_registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 19e8fed2d71da078cb054a3771ef2c3fd8108b38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19e8fed2d71da0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 6 17:02:03 2018 +0100 Moved cmk.gui.plugin_registry to cmk.plugin_registry Change-Id: I02190ed1ff406be168679f11858f253958bce15c --- cmk/gui/gui_background_job.py | 4 ++-- cmk/gui/metrics.py | 4 ++-- cmk/gui/plugins/dashboard/utils.py | 5 +++-- cmk/gui/plugins/sidebar/quicksearch.py | 7 ++++--- cmk/gui/plugins/sidebar/utils.py | 5 +++-- cmk/gui/plugins/userdb/utils.py | 6 +++--- cmk/gui/plugins/wato/utils/__init__.py | 5 +++-- cmk/gui/plugins/webapi/utils.py | 5 +++-- cmk/gui/sidebar.py | 1 - cmk/gui/userdb.py | 1 - cmk/gui/wato/__init__.py | 1 - cmk/gui/watolib.py | 6 +++--- cmk/{gui => }/plugin_registry.py | 3 +++ tests/unit/cmk/{gui => }/test_plugin_registry.py | 4 ++-- 14 files changed, 31 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=19e8fed2d7…

5 years, 7 months

← Newer
1
...
37
38
39
40
41
42
43
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018