Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Refactoring: Split up several functions ( prep for too-many-branches pylint checker)

by Lars Michelsen

Module: check_mk Branch: master Commit: 4b65d559020a1a921a8e01434229b9ab9a51d25f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b65d559020a1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 08:22:42 2018 +0200 Refactoring: Split up several functions (prep for too-many-branches pylint checker) Change-Id: I542288c53c0898c8945a234f2d56b862a4e9022b --- agents/plugins/mk_jolokia | 130 +++++++++------ checks/ucs_bladecenter_if | 405 ++++++++++++++++++++++++---------------------- cmk_base/core_nagios.py | 120 ++++++++------ 3 files changed, 353 insertions(+), 302 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4b65d55902…

6 years, 1 month

6365 FIX Another fix for debian package incompatibilities (extends 6340)

by Lars Michelsen

Module: check_mk Branch: master Commit: 377f0e7c4b227df2888e81e887f73b9800ce0f8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=377f0e7c4b227d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 16:39:37 2018 +0200 6365 FIX Another fix for debian package incompatibilities (extends 6340) Werk 6340 tried to fix a compatibility issue with older debian versions. The Fix of this werk was not 100% working as intended. We have now made additional changes to make the packages work again for all debian versions. Change-Id: I7b42e6596b43f61749a47d5fc9bb0cb930c9e9a8 --- .werks/6365 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/6365 b/.werks/6365 new file mode 100644 index 0000000..1a44690 --- /dev/null +++ b/.werks/6365 @@ -0,0 +1,13 @@ +Title: Another fix for debian package incompatibilities (extends 6340) +Level: 1 +Component: deb +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532442860 + +Werk 6340 tried to fix a compatibility issue with older debian versions. The +Fix of this werk was not 100% working as intended. We have now made additional +changes to make the packages work again for all debian versions.

6 years, 1 month

Fixed SyntaxError: 'return' with argument inside generator

by Simon Betz

Module: check_mk Branch: master Commit: 0c5810b9b8ad8190d46626c08e2db04cfce9c59f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c5810b9b8ad81… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 24 15:23:50 2018 +0200 Fixed SyntaxError: 'return' with argument inside generator Change-Id: Ib4dee20c795894d38671e31e94a1b5c62054b2c3 --- checks/fileinfo | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/fileinfo b/checks/fileinfo index 030e0c9..8c2f639 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -238,7 +238,8 @@ def check_fileinfo_groups(item, params, info): try: reftime = int(info[0][0]) except (IndexError, ValueError): - return 3, "Missing reference timestamp" + yield 3, "Missing reference timestamp" + return # Start counting values on all files for line in info[1:]:

6 years, 1 month

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 90c55dc0f7b156510a802e03a504e1b5abcf93dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90c55dc0f7b156… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 24 15:08:56 2018 +0200 Reserved 20 Werk IDS Change-Id: I423a2223f841da610ec10bbdd8259addf43e0fa2 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index a8c4b8e..29b84ae 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6379 +6399

6 years, 1 month

5917 FIX Facelift theme: Fixed Logo in Browser tab

by Marcel Arentz

Module: check_mk Branch: master Commit: 04377ad3a0fe22bce9d0e8a627bc1a4d836b67c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04377ad3a0fe22… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Jul 24 10:55:59 2018 +0200 5917 FIX Facelift theme: Fixed Logo in Browser tab Previously the old log still has been used. Change-Id: I2e3f2198e5e60c23b09b9d5abca71a2b6e1f2ac4 --- .werks/5917 | 10 ++++++++++ cmk/gui/htmllib.py | 2 +- web/htdocs/themes/facelift/images/favicon.ico | Bin 0 -> 16958 bytes 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5917 b/.werks/5917 new file mode 100644 index 0000000..0e03707 --- /dev/null +++ b/.werks/5917 @@ -0,0 +1,10 @@ +Title: Facelift theme: Fixed Logo in Browser tab +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1532422502 +Class: fix + +Previously the old logo still has been used. diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 81e2051..2b8df33 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1730,7 +1730,7 @@ class html(HTMLGenerator): def default_html_headers(self): self.meta(httpequiv="Content-Type", content="text/html; charset=utf-8") self.meta(httpequiv="X-UA-Compatible", content="IE=edge") - self.write_html(self._render_opening_tag('link', rel="shortcut icon", href="images/favicon.ico", type_="image/ico", close_tag=True)) + self.write_html(self._render_opening_tag('link', rel="shortcut icon", href=self._detect_themed_image_path("images/favicon.ico"), type_="image/ico", close_tag=True)) def _head(self, title, javascripts=None, stylesheets=None): diff --git a/web/htdocs/themes/facelift/images/favicon.ico b/web/htdocs/themes/facelift/images/favicon.ico new file mode 100644 index 0000000..448c2fc Binary files /dev/null and b/web/htdocs/themes/facelift/images/favicon.ico differ

6 years, 1 month

test_mkbackup: Make backup/restore output more verbose

by Lars Michelsen

Module: check_mk Branch: master Commit: 45d13f0a71881f2b7b71ad2af04362ef3a27a0aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45d13f0a71881f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 14:43:18 2018 +0200 test_mkbackup: Make backup/restore output more verbose Change-Id: Ib267d762e149bdb5e04b44633a17c559db009c99 --- tests/integration/bin/test_mkbackup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/bin/test_mkbackup.py b/tests/integration/bin/test_mkbackup.py index 71b5907..c6b9024 100644 --- a/tests/integration/bin/test_mkbackup.py +++ b/tests/integration/bin/test_mkbackup.py @@ -86,7 +86,7 @@ def _execute_backup(site, job_id="testjob"): stdout, stderr = p.communicate() assert stderr == "" assert p.wait() == 0 - assert "Backup completed " in stdout + assert "Backup completed" in stdout, "Invalid output: %r" % stdout # Check successful backup listing p = site.execute(["mkbackup", "list", "test-target"], @@ -113,7 +113,7 @@ def _execute_restore(site, backup_id, env=None): p = site.execute(["mkbackup", "restore", "test-target", backup_id], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env) stdout, stderr = p.communicate() - assert "Restore completed" in stdout + assert "Restore completed" in stdout, "Invalid output: %r" % stdout assert stderr == "" assert p.wait() == 0

6 years, 1 month

Make pylint report correct paths for real modules and compiled check/ inventory/bakery plugin files

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ef04f794c0c08353055b95948fdad7b4a3edff3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ef04f794c0c08… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 11:51:34 2018 +0200 Make pylint report correct paths for real modules and compiled check/inventory/bakery plugin files Change-Id: I3424621f78fb4e0a26353676d508cc640c60572b --- tests/testlib/pylint_cmk.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index d3704fc..32acb8d 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -112,8 +112,15 @@ def is_python_file(path): # python modules. This custom reporter rewrites the found # messages to tell the users the original location in the # python sources +# TODO: This can be dropped once we have refactored checks/inventory/bakery plugins +# to real modules class CMKFixFileMixin(object): def handle_message(self, msg): + # This hack is not needed for already modularized paths + if msg.abspath.startswith(cmk_path()): + super(CMKFixFileMixin, self).handle_message(msg) + return + new_path, new_line = self._orig_location_from_compiled_file(msg) if new_path == None:

6 years, 1 month

Merged all pylint tests into a single test

by Lars Michelsen

Module: check_mk Branch: master Commit: c410cebf8e6376c852cf55ec212edae594ccacd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c410cebf8e6376… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 12:39:34 2018 +0200 Merged all pylint tests into a single test * The check / inventory and agent plugins still need to be compiled to a fake modules * Merged check and inventory plugins together to a single compiled file to prevent checking the checks twice * Execute all pylint checks using a single call Reduces total execution time from 4:00 to 2:30 min Change-Id: If3c3cdd469187d20def04428c40cf294aaf66ea6 --- tests/pylint/test_pylint.py | 54 ++++++++++----------------------------------- 1 file changed, 12 insertions(+), 42 deletions(-) diff --git a/tests/pylint/test_pylint.py b/tests/pylint/test_pylint.py index 859cbad..d96e893 100755 --- a/tests/pylint/test_pylint.py +++ b/tests/pylint/test_pylint.py @@ -33,7 +33,7 @@ def pylint_test_dir(): shutil.rmtree(test_dir) -def test_pylint_misc(): +def test_pylint(pylint_test_dir): # Only specify the path to python packages or modules here modules_or_packages = [ # Check_MK base @@ -59,6 +59,14 @@ def test_pylint_misc(): "managed/cmk/gui/cme", ] + # Add the compiled files for things that are no modules yet + file(pylint_test_dir + "/__init__.py", "w") + _compile_check_and_inventory_plugins(pylint_test_dir) + _compile_bakery_plugins(pylint_test_dir) + modules_or_packages += [ + pylint_test_dir, + ] + # We use our own search logic to find scripts without python extension search_paths = [ "omd/packages/omd", @@ -80,8 +88,8 @@ def test_pylint_misc(): assert exit_code == 0, "PyLint found an error" -def test_pylint_inventory_plugins(pylint_test_dir): - with open(pylint_test_dir + "/cmk-inventory-plugins.py", "w") as f: +def _compile_check_and_inventory_plugins(pylint_test_dir): + with open(pylint_test_dir + "/cmk_checks.py", "w") as f: # Fake data structures where checks register (See cmk_base/checks.py) f.write(""" @@ -114,8 +122,6 @@ def inv_tree(path, default_value=None): # add the modules pylint_cmk.add_file(f, repo_path() + "/cmk_base/check_api.py") - - # add the modules pylint_cmk.add_file(f, repo_path() + "/cmk_base/inventory_plugins.py") # Now add the checks @@ -126,41 +132,8 @@ def inv_tree(path, default_value=None): for path in pylint_cmk.check_files(repo_path() + "/inventory"): pylint_cmk.add_file(f, path) - exit_code = pylint_cmk.run_pylint(pylint_test_dir) - assert exit_code == 0, "PyLint found an error in inventory plugins" - -def test_pylint_checks(pylint_test_dir): - with open(pylint_test_dir + "/cmk-checks.py", "w") as f: - - # Fake data structures where checks register (See cmk_base/checks.py) - f.write(""" -# -*- encoding: utf-8 -*- -check_info = {} -check_includes = {} -precompile_params = {} -check_default_levels = {} -factory_settings = {} -check_config_variables = [] -snmp_info = {} -snmp_scan_functions = {} -active_check_info = {} -special_agent_info = {} -""") - - # add the modules - pylint_cmk.add_file(f, repo_path() + "/cmk_base/check_api.py") - - # Now add the checks - for path in pylint_cmk.check_files(repo_path() + "/checks"): - pylint_cmk.add_file(f, path) - - exit_code = pylint_cmk.run_pylint(pylint_test_dir) - assert exit_code == 0, "PyLint found an error in checks, inventory " \ - "or agent bakery plugins" - - -def test_pylint_bakery_plugins(pylint_test_dir): +def _compile_bakery_plugins(pylint_test_dir): with open(pylint_test_dir + "/cmk_bakery_plugins.py", "w") as f: pylint_cmk.add_file(f, os.path.realpath(os.path.join(cmc_path(), "cmk_base/cee/agent_bakery_plugins.py"))) @@ -168,6 +141,3 @@ def test_pylint_bakery_plugins(pylint_test_dir): # Also add bakery plugins for path in pylint_cmk.check_files(os.path.join(cmc_path(), "agents/bakery")): pylint_cmk.add_file(f, path) - - exit_code = pylint_cmk.run_pylint(pylint_test_dir) - assert exit_code == 0, "PyLint found an error in agent bakery plugins"

6 years, 1 month

Removed pylint checker superceded by pylint_checker_localization

by Lars Michelsen

Module: check_mk Branch: master Commit: 261ed98297ef7c8ff8589ff7507ef15335d3252a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=261ed98297ef7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 12:59:58 2018 +0200 Removed pylint checker superceded by pylint_checker_localization Change-Id: Ia4e8ade42501a78cac8b56fd9df4647f72dad2cd --- tests/pylint/pylintrc | 1 - tests/testlib/pylint_checker_wrong_i18n.py | 79 ------------------------------ 2 files changed, 80 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index deb03dc..ab09382 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -5,7 +5,6 @@ init-hook= test_path = os.environ.get("TEST_PATH", os.environ["HOME"] + "/git/check_mk/tests") sys.path.insert(0, test_path) import conftest -# load-plugins=testlib.pylint_cmk,testlib.pylint_checker_wrong_i18n load-plugins=testlib.pylint_cmk,testlib.pylint_checker_localization # TODO: Why do we need persistence? persistent=yes diff --git a/tests/testlib/pylint_checker_wrong_i18n.py b/tests/testlib/pylint_checker_wrong_i18n.py deleted file mode 100644 index 602b520..0000000 --- a/tests/testlib/pylint_checker_wrong_i18n.py +++ /dev/null @@ -1,79 +0,0 @@ -"""Checker for incorrect string translation functions.""" - -import six - -import astroid - -from pylint.checkers import BaseChecker, utils -from pylint.interfaces import IAstroidChecker - -BASE_ID = 76 - -def register(linter): - """Register checkers.""" - linter.register_checker(TranslationStringConstantsChecker(linter)) - - -class TranslationStringConstantsChecker(BaseChecker): - """ - Checks for i18n translation functions (_, ugettext, ungettext, and many - others) being called on something that isn't a string literal. - - Bad: - _("hello {}".format(name)) - ugettext("Hello " + name) - ugettext(value_from_database) - - OK: - _("hello {}").format(name) - - The message id is `translation-of-non-string`. - - """ - - __implements__ = (IAstroidChecker,) - - name = 'translation-string-checker' - - TRANSLATION_FUNCTIONS = set([ - '_', - 'gettext', - 'ngettext', 'ngettext_lazy', - 'npgettext', 'npgettext_lazy', - 'pgettext', 'pgettext_lazy', - 'ugettext', 'ugettext_lazy', 'ugettext_noop', - 'ungettext', 'ungettext_lazy', - ]) - - MESSAGE_ID = 'translation-of-non-string' - msgs = { - 'E%d10' % BASE_ID: ( - "i18n function %s() must be called with a literal string", - MESSAGE_ID, - "i18n functions must be called with a literal string", - ), - } - - @utils.check_messages(MESSAGE_ID) - def visit_callfunc(self, node): - """Called for every function call in the source code.""" - - if not isinstance(node.func, astroid.Name): - # It isn't a simple name, can't deduce what function it is. - return - - if node.func.name not in self.TRANSLATION_FUNCTIONS: - # Not a function we care about. - return - - if not self.linter.is_message_enabled(self.MESSAGE_ID, line=node.fromlineno): - return - - first = node.args[0] - if isinstance(first, astroid.Const): - if isinstance(first.value, six.string_types): - # The first argument is a constant string! All is well! - return - - # Bad! - self.add_message(self.MESSAGE_ID, args=node.func.name, node=node)

6 years, 1 month

Moved all pylint tests to a single file

by Lars Michelsen

Module: check_mk Branch: master Commit: a35fdf0744797c98e2e97b572b00032ee373fd9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a35fdf0744797c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 11:56:18 2018 +0200 Moved all pylint tests to a single file Change-Id: I93e4a3ac61187a7bfbde00af2c025917454a66fc --- tests/pylint/test_pylint.py | 147 ++++++++++++++++++++++++++ tests/pylint/test_pylint_bakery_plugins.py | 19 ---- tests/pylint/test_pylint_check_plugins.py | 37 ------- tests/pylint/test_pylint_inventory_plugins.py | 56 ---------- tests/pylint/test_pylint_misc.py | 54 ---------- 5 files changed, 147 insertions(+), 166 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a35fdf0744…

6 years, 1 month

← Newer
1
...
10
11
12
13
14
15
16
...
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