Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Moved pylint_test_dir fixture to test_pylint file

by Lars Michelsen

Module: check_mk Branch: master Commit: fc799ecf72adf1dd338cf8f8d1c8bf6a536a5af3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc799ecf72adf1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 11:58:24 2018 +0200 Moved pylint_test_dir fixture to test_pylint file Change-Id: Ifab3f173962ff1c1f14760381f3e4b1bba04326c --- tests/pylint/conftest.py | 26 -------------------------- tests/pylint/test_pylint.py | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/pylint/conftest.py b/tests/pylint/conftest.py index 30a8be0..09f783b 100644 --- a/tests/pylint/conftest.py +++ b/tests/pylint/conftest.py @@ -1,9 +1,5 @@ #!/usr/bin/env python -import sys -import os -import tempfile -import shutil import pytest # pylint tests should not be executed in site. @@ -11,25 +7,3 @@ import pytest @pytest.fixture(scope="session") def site(request): pass - -(a)pytest.fixture(scope="function") -def pylint_test_dir(): - base_path = os.environ.get("WORKDIR") - if base_path: - base_path += "/" + os.path.basename(sys.argv[0]) - if not os.path.exists(base_path): - os.makedirs(base_path) - else: - base_path = None - - test_dir = tempfile.mkdtemp(prefix="cmk_pylint", dir=base_path) - - print("Prepare check in %s ..." % test_dir) - yield test_dir - - # - # Cleanup code - # - - print("Cleanup pylint test dir %s ..." % test_dir) - shutil.rmtree(test_dir) diff --git a/tests/pylint/test_pylint.py b/tests/pylint/test_pylint.py index f5f5c93..859cbad 100755 --- a/tests/pylint/test_pylint.py +++ b/tests/pylint/test_pylint.py @@ -3,10 +3,36 @@ import os import sys +import pytest +import tempfile +import shutil from testlib import cmk_path, cmc_path, cme_path, repo_path import testlib.pylint_cmk as pylint_cmk +(a)pytest.fixture(scope="function") +def pylint_test_dir(): + base_path = os.environ.get("WORKDIR") + if base_path: + base_path += "/" + os.path.basename(sys.argv[0]) + if not os.path.exists(base_path): + os.makedirs(base_path) + else: + base_path = None + + test_dir = tempfile.mkdtemp(prefix="cmk_pylint", dir=base_path) + + print("Prepare check in %s ..." % test_dir) + yield test_dir + + # + # Cleanup code + # + + print("Cleanup pylint test dir %s ..." % test_dir) + shutil.rmtree(test_dir) + + def test_pylint_misc(): # Only specify the path to python packages or modules here modules_or_packages = [

6 years, 1 month

6364 FIX check_mk_active_bi: Fixed crashed checks (Regression in 1.5.0b9)

by Lars Michelsen

Module: check_mk Branch: master Commit: 97e6767074f558331dc6dc22c0c3a406403e6409 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97e6767074f558… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 13:18:44 2018 +0200 6364 FIX check_mk_active_bi: Fixed crashed checks (Regression in 1.5.0b9) The check crashed with an "Invalid json reponse" error since 1.5.0b9. Change-Id: Ibc33e6e0e787986382a5e3d2d809151c0b9ac71b --- .werks/6364 | 11 +++++++++++ cmk/gui/views.py | 2 ++ 2 files changed, 13 insertions(+) diff --git a/.werks/6364 b/.werks/6364 new file mode 100644 index 0000000..fdb68f2 --- /dev/null +++ b/.werks/6364 @@ -0,0 +1,11 @@ +Title: check_mk_active_bi: Fixed crashed checks (Regression in 1.5.0b9) +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532431051 + +The check crashed with an "Invalid json reponse" error since 1.5.0b9. diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 7da9f21..8cf510f 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1422,6 +1422,8 @@ def ajax_set_viewoption(): def show_context_links(thisview, datasource, show_filters, enable_commands, enable_checkboxes, show_checkboxes, show_availability, show_combined_graphs): + if html.output_format != "html": + return html.begin_context_buttons()

6 years, 1 month

Remove None module entries to avoid crash in cmk/gui/modules.py

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1f383dcb1e890681636a5db6903a3e052f97d594 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f383dcb1e8906… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Jul 24 13:19:39 2018 +0200 Remove None module entries to avoid crash in cmk/gui/modules.py Change-Id: I07730cab181adb4200eb01024bb8289cade9c384 --- cmk/gui/modules.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmk/gui/modules.py b/cmk/gui/modules.py index a0a4a6a..7ba9684 100644 --- a/cmk/gui/modules.py +++ b/cmk/gui/modules.py @@ -137,9 +137,12 @@ def load_all_plugins(): def _cmk_gui_top_level_modules(): return [ module for name, module in sys.modules.items() - if (name.startswith("cmk.gui.") and len(name.split(".")) == 3) - or (name.startswith("cmk.gui.cee.") and len(name.split(".")) == 4) - or (name.startswith("cmk.gui.cme.") and len(name.split(".")) == 4) ] + # None entries are only an import optimization of cPython and can be removed: + # https://www.python.org/dev/peps/pep-0328/#relative-imports-and-indirection-… + if module is not None + and ((name.startswith("cmk.gui.") and len(name.split(".")) == 3) + or (name.startswith("cmk.gui.cee.") and len(name.split(".")) == 4) + or (name.startswith("cmk.gui.cme.") and len(name.split(".")) == 4)) ]

6 years, 1 month

Fixed typo resulting in broken GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: f36a62a39606d2b34b9e7602f891e568f42e175f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f36a62a39606d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 11:21:22 2018 +0200 Fixed typo resulting in broken GUI Change-Id: If6511f9c60b5489df77db0dbd425eda1b25011c9 --- omd/packages/check_mk/skel/etc/check_mk/apache.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/check_mk/skel/etc/check_mk/apache.conf b/omd/packages/check_mk/skel/etc/check_mk/apache.conf index 3c38b82..ab1c31f 100644 --- a/omd/packages/check_mk/skel/etc/check_mk/apache.conf +++ b/omd/packages/check_mk/skel/etc/check_mk/apache.conf @@ -69,7 +69,7 @@ Alias /###SITE###/check_mk ###ROOT###/share/check_mk/web/htdocs # the version strings. This is done with mod_rewrite. # e.g. change http://localhost/event/check_mk/js/checkmk-2014.10.22.js to # e.g. change http://localhost/event/check_mk/js/checkmk.js - RewriteRule "^(js/|themes/.*?/|)([a-z0-9_]+)-(.+?)\.(js|css)$" "/###SITE###/c heck_mk/$1$2.$4" + RewriteRule "^(js/|themes/.*?/|)([a-z0-9_]+)-(.+?)\.(js|css)$" "/###SITE###/check_mk/$1$2.$4" # Rewrite rules for handling the local-hierarchy. All URI to static # files are redirected, if those exist in local/. Thus the user

6 years, 1 month

6362 FIX Preview graphs of "Service Graphs with Timerange Previews" painter can now be overridden

by Lars Michelsen

Module: check_mk Branch: master Commit: 60114c8cf9c9605871802622a35f943fbce211c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60114c8cf9c960… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 11:15:46 2018 +0200 6362 FIX Preview graphs of "Service Graphs with Timerange Previews" painter can now be overridden The option "show previews" of the painter "Service Graphs with Timerange Previews" could be disabled using the painter and display options of a view, but had no effect. Change-Id: I3ea9f5bb766ad7e542bb6851a411abb88536cfb2 --- .werks/6362 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/6362 b/.werks/6362 new file mode 100644 index 0000000..c714d54 --- /dev/null +++ b/.werks/6362 @@ -0,0 +1,12 @@ +Title: Preview graphs of "Service Graphs with Timerange Previews" painter can now be overridden +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1532334499 + +The option "show previews" of the painter "Service Graphs with Timerange Previews" could be +disabled using the painter and display options of a view, but had no effect.

6 years, 1 month

Addition to werk 6357 (Fix more themed icons)

by Lars Michelsen

Module: check_mk Branch: master Commit: 1f2f1771499289f99c995b69805b9832865034f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f2f1771499289… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 20:09:24 2018 +0200 Addition to werk 6357 (Fix more themed icons) Change-Id: I23eeae8ec1cb7018334dc6dabb0e70201df0ff93 --- cmk/gui/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index d5dcb45..81e2051 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -2168,7 +2168,7 @@ class html(HTMLGenerator): style='display:none' if hidden else None, ) self.open_a("javascript:void(0)", onclick=onclick) - self.img(src="images/icon_%s.png" % icon) + self.icon(help=None, icon=icon) self.close_a() self.close_div()

6 years, 1 month

6318 FIX check_mk_agent.{linux, solaris, openwrt}: Quote command line in asynchronous MRPE call to prevent globbing and word splitting

by Simon Betz

Module: check_mk Branch: master Commit: e1b633ad0fe84f3a1c2ce7923349bc0661d0034f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1b633ad0fe84f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 24 09:54:09 2018 +0200 6318 FIX check_mk_agent.{linux,solaris,openwrt}: Quote command line in asynchronous MRPE call to prevent globbing and word splitting Change-Id: Ie64b0bc8f3f11dc6c5885949897b2528a7cfc502 --- .werks/6318 | 10 ++++++++++ agents/check_mk_agent.linux | 4 ++-- agents/check_mk_agent.openwrt | 4 ++-- agents/check_mk_agent.solaris | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.werks/6318 b/.werks/6318 new file mode 100644 index 0000000..8f11e7b --- /dev/null +++ b/.werks/6318 @@ -0,0 +1,10 @@ +Title: check_mk_agent.{linux,solaris,openwrt}: Quote command line in asynchronous MRPE call to prevent globbing and word splitting +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1532418648 +Class: fix + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8b7d8c4..93ca7e4 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -264,9 +264,9 @@ function run_cached () { if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then # When the command fails, the output is throws away ignored if [ $mrpe -eq 1 ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & else - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & fi fi } diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 463e56a..fdea879 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -167,9 +167,9 @@ run_cached () { # When the command fails, the output is throws away ignored if [ $mrpe -eq 1 ] ; then # TODO: This won't work: run_mrpe is not exported. And do we have bash at all? - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & else - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & fi fi } diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 7afe5b5..0aefef3 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -123,9 +123,9 @@ function run_cached () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then if [ $mrpe -eq 1 ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & else - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & fi fi }

6 years, 1 month

Enabled duplicate-code warning.

by Sven Panne

Module: check_mk Branch: master Commit: 2fc3d41e9841c0d0a4f680319073b99dd40a115e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fc3d41e9841c0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 24 08:39:10 2018 +0200 Enabled duplicate-code warning. Funnily enough, pylint does not emit a single warning although we have *tons* of duplicate code (see our PMD Jenkins job). To be analyzed in the future... Change-Id: I55fff95d36c13e5a3beb004c4d08c3eb11f53d2e --- tests/pylint/pylintrc | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index a3867ed..deb03dc 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -17,7 +17,6 @@ disable= consider-iterating-dictionary, consider-using-enumerate, consider-using-ternary, - duplicate-code, inconsistent-return-statements, len-as-condition, logging-not-lazy,

6 years, 1 month

Use the right scope for temporary directories.

by Sven Panne

Module: check_mk Branch: master Commit: a7c9f094e0346ed6189e321320f029d332dae988 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7c9f094e0346e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 24 09:59:46 2018 +0200 Use the right scope for temporary directories. Change-Id: Iead4f96896fc4b790e64620f90c57b9654a32500 --- tests/pylint/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pylint/conftest.py b/tests/pylint/conftest.py index 970f8e2..30a8be0 100644 --- a/tests/pylint/conftest.py +++ b/tests/pylint/conftest.py @@ -12,7 +12,7 @@ import pytest def site(request): pass -(a)pytest.fixture(scope="session") +(a)pytest.fixture(scope="function") def pylint_test_dir(): base_path = os.environ.get("WORKDIR") if base_path:

6 years, 1 month

Reduce duplicated work for pylint.

by Sven Panne

Module: check_mk Branch: master Commit: 18d5f84f4b64cd1eb3ed4acaa6f9857b01b4addb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18d5f84f4b64cd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 24 09:34:19 2018 +0200 Reduce duplicated work for pylint. pylint automatically recurses into packages, so repeating subpackages just creates additional useless work. In addition, the output was sometimes confusing because different parallel jobs reported the same warning multiple times. This shaves off roughly 1 min of the pylint runs. Still some cleanup to do, the overlay mechanism and symlinks are highly confusing... Change-Id: I25609eabcef63410de9db64f5385b2b362f408a6 --- tests/pylint/test_pylint_misc.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index c06f0e9..41bcd09 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -12,25 +12,23 @@ def test_pylint_misc(): modules_or_packages = [ # Check_MK base "cmk_base", - "cmk_base/modes", - "cmk_base/automations", - "cmk_base/default_config", - "cmk_base/data_sources", - "enterprise/cmk_base/cee", - "enterprise/cmk_base/modes/cee.py", + # TODO: Check if this kind of "overlay" really works. + # TODO: Why do we have e.g. a symlink cmk_base/cee -> enterprise/cmk_base/cee? "enterprise/cmk_base/automations/cee.py", + "enterprise/cmk_base/cee", "enterprise/cmk_base/default_config/cee.py", + "enterprise/cmk_base/modes/cee.py", "managed/cmk_base/default_config/cme.py", # cmk module level + # TODO: This checks the whole cmk hierarchy, including things like + # cmk.gui.plugins.cron etc. Do we really want that here? + # TODO: Funny links there, see above. "cmk", - "cmk/ec", "enterprise/cmk/cee", - "enterprise/cmk/cee/liveproxy", # GUI specific "web/app/index.wsgi", - "cmk/gui", "enterprise/cmk/gui/cee", "managed/cmk/gui/cme", ]

6 years, 1 month

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