Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

by Andreas Umbreit

Module: check_mk Branch: master Commit: 8c3d0ecff2050f16ca13741bd3d459249db2f0fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c3d0ecff2050f… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Jul 16 16:34:53 2018 +0200 CMK-527: Add Werk 5505 5505 Multiple formats for Agent Updater executable on Linux Since Check_MK 1.5.0i2, the Linux Agent Updater executable (cmk-update-agent) got deployed as a 64bit binary executable file, see Werk #5267 for details. After regarding some customer feedback, we decided to bring back the cmk-update-agent python script to Check_MK and additionally offer a 32bit binary executable format. As a result, you can now choose between 3 executable formats for the cmk-update-agent executable to be deployed by configuring the entry "Executable format (Linux/UNIX)" within the Agent Updater ruleset: "64bit ELF executable", "32bit ELF executable" and "Python2 script", with 64bit executable being the default if no rule entry is configured. Additionally, the rule entry will be ignored on Windows hosts, so there is no need to manually exclude your Windows hosts from a ruleset. Please note that the deployment of the Python2 script may bring back some old problems (for details, see again Werk #5267) and hence we can offer no support for troubleshooting while deploying the Agent Updater as a script. However, a mail to feedback(a)check-mk.org is much appreciated. Change-Id: I0539bfcf340ea1446276614dc3368c8d183eae32 --- .werks/5505 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.werks/5505 b/.werks/5505 new file mode 100644 index 0000000..5758b83 --- /dev/null +++ b/.werks/5505 @@ -0,0 +1,25 @@ +Title: Multiple formats for Agent Updater executable on Linux +Level: 2 +Component: agents +Class: feature +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1531750420 + +Since Check_MK 1.5.0i2, the Linux Agent Updater executable (cmk-update-agent) +got deployed as a 64bit binary executable file, see Werk #5267 for details. + +After regarding some customer feedback, we decided to bring back the cmk-update-agent +python script to Check_MK and additionally offer a 32bit binary executable format. +As a result, you can now choose between 3 executable formats for the cmk-update-agent +executable to be deployed by configuring the entry "Executable format (Linux/UNIX)" within +the Agent Updater ruleset: "64bit ELF executable", "32bit ELF executable" and "Python2 script", +with 64bit executable being the default if no rule entry is configured. Additionally, the rule entry +will be ignored on Windows hosts, so there is no need to manually exclude your Windows hosts +from a ruleset. + +Please note that the deployment of the Python2 script may bring back some old problems (for +details, see again Werk #5267) and hence we can offer no support for troubleshooting while deploying +the Agent Updater as a script. However, a mail to feedback(a)check-mk.org is much appreciated.

6 years, 2 months

Another try to fix the GUI crawler

by Lars Michelsen

Module: check_mk Branch: master Commit: d77e1cb1c43b1dfa49e085bb6692833891ac8d4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d77e1cb1c43b1d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 20:37:09 2018 +0200 Another try to fix the GUI crawler Change-Id: I46a9111b5f22ba3123d6dde957d5d6dce00f33cf --- cmk/gui/wato/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index a01ab6d..26dbcc9 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -16694,7 +16694,6 @@ class ModeRegistry(cmk.gui.plugin_registry.ClassRegistry): mode_registry = ModeRegistry() -mode_registry.load_plugins() modes = {} # TODO: Drop this and probably replace with a hook at button rendering? @@ -17007,6 +17006,10 @@ def load_plugins(force): utils.load_web_plugins("wato", globals()) + # TODO: Needs to be done after plugin loading. Temporarily needed till we have + # changed the registry to explicit registration in the next days + mode_registry.load_plugins() + if modes: raise MKGeneralException(_("Deprecated WATO modes found: %r. " "They need to be refactored to new API.") % modes.keys())

6 years, 2 months

Merged pylint_web test into pylint_misc

by Lars Michelsen

Module: check_mk Branch: master Commit: 14572caa52ab8e2c19cf9e1de576fbe206129288 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14572caa52ab8e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 13 15:44:21 2018 +0200 Merged pylint_web test into pylint_misc Change-Id: I9f903f8f8329528dcda3fc708095b0e4bdbc1897 --- tests/pylint/test_pylint_misc.py | 15 +++++++++++---- tests/pylint/test_pylint_web.py | 9 --------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index ee6ac17..c06f0e9 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -8,24 +8,31 @@ from testlib import cmk_path, cmc_path, cme_path import testlib.pylint_cmk as pylint_cmk def test_pylint_misc(): + # Only specify the path to python packages or modules here modules_or_packages = [ + # Check_MK base "cmk_base", "cmk_base/modes", "cmk_base/automations", "cmk_base/default_config", "cmk_base/data_sources", - - "enterprise/cmk/cee", - "enterprise/cmk/cee/liveproxy", "enterprise/cmk_base/cee", "enterprise/cmk_base/modes/cee.py", "enterprise/cmk_base/automations/cee.py", "enterprise/cmk_base/default_config/cee.py", - "managed/cmk_base/default_config/cme.py", + # cmk module level "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", ] # We use our own search logic to find scripts without python extension diff --git a/tests/pylint/test_pylint_web.py b/tests/pylint/test_pylint_web.py deleted file mode 100755 index 4859fa6..0000000 --- a/tests/pylint/test_pylint_web.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/python -# encoding: utf-8 - -from testlib import cmk_path -import testlib.pylint_cmk as pylint_cmk - -def test_pylint_web(): - exit_code = pylint_cmk.run_pylint(cmk_path(), ["web/app/index.wsgi", "cmk/gui", "enterprise/cmk/gui/cee", "managed/cmk/gui/cme"]) - assert exit_code == 0, "PyLint found an error in the web code"

6 years, 2 months

pylint_misc: Invoke pylint once for all files to be checked

by Lars Michelsen

Module: check_mk Branch: master Commit: 24fb5bc416044542eb0584f1846db4578e4c3178 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24fb5bc4160445… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 13 15:34:19 2018 +0200 pylint_misc: Invoke pylint once for all files to be checked Change-Id: Id1e6a3a98291752e9a88166661459464a63b71f6 --- tests/pylint/test_pylint_misc.py | 73 +++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 39 deletions(-) diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index 85274dc..ee6ac17 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -8,47 +8,42 @@ from testlib import cmk_path, cmc_path, cme_path import testlib.pylint_cmk as pylint_cmk def test_pylint_misc(): + modules_or_packages = [ + "cmk_base", + "cmk_base/modes", + "cmk_base/automations", + "cmk_base/default_config", + "cmk_base/data_sources", + + "enterprise/cmk/cee", + "enterprise/cmk/cee/liveproxy", + "enterprise/cmk_base/cee", + "enterprise/cmk_base/modes/cee.py", + "enterprise/cmk_base/automations/cee.py", + "enterprise/cmk_base/default_config/cee.py", + + "managed/cmk_base/default_config/cme.py", + + "cmk", + "cmk/ec", + ] + + # We use our own search logic to find scripts without python extension search_paths = [ - cmk_path() + "/omd/packages/omd", - - cmk_path() + "/cmk_base", - cmk_path() + "/cmk_base/modes", - cmk_path() + "/cmk_base/automations", - cmk_path() + "/cmk_base/default_config", - cmk_path() + "/cmk_base/data_sources", - - cmc_path() + "/cmk", - cmc_path() + "/cmk/gui", - cme_path() + "/cmk/gui/default_config", - cmc_path() + "/cmk/cee/liveproxy", - cmc_path() + "/cmk_base", - cmc_path() + "/cmk_base/cee", - cmc_path() + "/cmk_base/modes", - cmc_path() + "/cmk_base/automations", - cmc_path() + "/cmk_base/default_config", - - cme_path() + "/cmk/gui", - cme_path() + "/cmk/gui/default_config", - cme_path() + "/cmk_base/default_config", - - cmk_path() + "/cmk", - cmk_path() + "/cmk/ec", - cmk_path() + "/cmk/gui", - cmk_path() + "/cmk/gui/default_config", - cmk_path() + "/bin", - cmk_path() + "/notifications", - cmk_path() + "/agents/plugins", - cmk_path() + "/agents/special", - cmk_path() + "/active_checks", - cmc_path() + "/agents/plugins", - cmc_path() + "/bin", - cmc_path() + "/misc", + "omd/packages/omd", + "bin", + "notifications", + "agents/plugins", + "agents/special", + "active_checks", + "enterprise/agents/plugins", + "enterprise/bin", + "enterprise/misc", ] - checked, worst = 0, 0 for path in search_paths: - worst = max(worst, pylint_cmk.run_pylint(path)) - checked += 1 + for fname in pylint_cmk.get_pylint_files(path, "*"): + modules_or_packages.append(path + "/" + fname) - assert checked > 0, "Did not find a file to check!" - assert worst == 0, "At least one issue found" + exit_code = pylint_cmk.run_pylint(cmk_path(), modules_or_packages) + assert exit_code == 0, "PyLint found an error"

6 years, 2 months

Changed user attribute default topic to "personal"

by Lars Michelsen

Module: check_mk Branch: master Commit: d3f309316f8ed79dd18d2192701fb9b96af8576d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3f309316f8ed7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 18:35:03 2018 +0200 Changed user attribute default topic to "personal" This restores the way it worked in 1.5 code. Change-Id: I24ce8f4cc0df2559ddc20063376279a2868a7799 --- cmk/gui/plugins/userdb/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/userdb/__init__.py b/cmk/gui/plugins/userdb/__init__.py index b2a8a80..a920610 100644 --- a/cmk/gui/plugins/userdb/__init__.py +++ b/cmk/gui/plugins/userdb/__init__.py @@ -176,8 +176,8 @@ class UserAttribute(object): def topic(self): - # type: () -> Optional[bytes] - return None + # type: () -> bytes + return "personal" def add_custom_macro(self):

6 years, 2 months

Partial revert to get background jobs working again. Ugly as hell...

by Sven Panne

Module: check_mk Branch: master Commit: 196c6daa2f022bcdf4208b52067b133c009917c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=196c6daa2f022b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 16 16:20:31 2018 +0200 Partial revert to get background jobs working again. Ugly as hell... Change-Id: Ie8d5ea35100729067db6822fb1ef0e3e2752473e --- cmk/gui/gui_background_job.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/cmk/gui/gui_background_job.py b/cmk/gui/gui_background_job.py index 8f2b93b..0069151 100644 --- a/cmk/gui/gui_background_job.py +++ b/cmk/gui/gui_background_job.py @@ -150,6 +150,24 @@ class GUIBackgroundJobSnapshottedFunctions(background_job.BackgroundJob): return self.get_status().get("user") != config.user.id + # FIXME: There is some arcane metaprogramming Kung Fu going on in + # GUIBackgroundStatusSnapshot which needs the methods *in this class*, + # although they are actually totally useless here. + def is_running(self): # pylint: disable=useless-super-delegation + return super(GUIBackgroundJobSnapshottedFunctions, self).is_running() + + + def exists(self): # pylint: disable=useless-super-delegation + return super(GUIBackgroundJobSnapshottedFunctions, self).exists() + + + def get_job_id(self): # pylint: disable=useless-super-delegation + return super(GUIBackgroundJobSnapshottedFunctions, self).get_job_id() + + + def get_title(self): # pylint: disable=useless-super-delegation + return super(GUIBackgroundJobSnapshottedFunctions, self).get_title() + # TODO: The superclasses are nonsense: GUIBackgroundJobSnapshottedFunctions # already derives from background_jobs.BackgroundJob. What is the right way to @@ -205,8 +223,8 @@ class GUIBackgroundStatusSnapshot(object): self._job_status = background_job.get_status() self._logger = background_job._logger.getChild("snapshot") - for name in dir(GUIBackgroundJobSnapshottedFunctions): - if callable(getattr(GUIBackgroundJobSnapshottedFunctions, name)): + for name, value in GUIBackgroundJobSnapshottedFunctions.__dict__.iteritems(): + if hasattr(value, "__call__"): self._job_status[name] = getattr(background_job, name)()

6 years, 2 months

6344 FIX Fixed exception in MIB listing when directories are e.g. in /usr/ share/snmp/mibs

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ec8456b4cf41ef41bfcbdb2c9a551ee0c0d8170 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ec8456b4cf41e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 15:23:46 2018 +0200 6344 FIX Fixed exception in MIB listing when directories are e.g. in /usr/share/snmp/mibs Change-Id: I16e8ac2aa7129db7bd8806877cb90e816fd3078d --- .werks/6344 | 11 +++++++++++ cmk/gui/plugins/wato/mkeventd.py | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/6344 b/.werks/6344 new file mode 100644 index 0000000..5fe4c81 --- /dev/null +++ b/.werks/6344 @@ -0,0 +1,11 @@ +Title: Fixed exception in MIB listing when directories are e.g. in /usr/share/snmp/mibs +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531471230 + + diff --git a/cmk/gui/plugins/wato/mkeventd.py b/cmk/gui/plugins/wato/mkeventd.py index 8b46664..8cf8d52 100644 --- a/cmk/gui/plugins/wato/mkeventd.py +++ b/cmk/gui/plugins/wato/mkeventd.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import os import zipfile import cStringIO @@ -2556,8 +2557,12 @@ class ModeEventConsoleMIBs(EventConsoleMode): raise for fn in file_names: + mib_path = path + "/" + fn + if os.path.isdir(mib_path): + continue + if fn[0] != '.': - mib = self._parse_snmp_mib_header(path + "/" + fn) + mib = self._parse_snmp_mib_header(mib_path) found[fn] = mib return found

6 years, 2 months

checktestlib.py: tiny bugfix

by Moritz Kiemer

Module: check_mk Branch: master Commit: 633a9b2200a6ecf7b98b5b3ef4dca802570839d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=633a9b2200a6ec… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jul 16 14:20:27 2018 +0200 checktestlib.py: tiny bugfix Change-Id: Id5b4ff6ea627ace903a0dfb74b5df0f1fa233b43 --- tests/unit/checks/checktestlib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index b71e8ba..263e3a8 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -514,7 +514,7 @@ def assertEqual(first, second, descr=''): if isinstance(first, dict): remainder = set(second.keys()) - for k, v in first: + for k in first: assert k in second, "%sadditional key %r in %r" \ % (descr, k, first) remainder.remove(k)

6 years, 2 months

Make mypy a tiny bit more happy.

by Sven Panne

Module: check_mk Branch: master Commit: 84f9c8cec5ed87f18fa6a28706035ea68e294225 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84f9c8cec5ed87… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 16 14:59:09 2018 +0200 Make mypy a tiny bit more happy. Change-Id: Ib2babcff9f882b2a0a5c3aae3a7d69bde4e8b03d --- cmk/gui/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/table.py b/cmk/gui/table.py index e533caa..025a59d 100644 --- a/cmk/gui/table.py +++ b/cmk/gui/table.py @@ -45,7 +45,7 @@ def open(table_id=None, title=None, **kwargs): def begin(table_id=None, title=None, **kwargs): - # type: Optional[bytes], Optional[Text] + # type: (Optional[bytes], Optional[Text], **Text) -> None tables.append(Table(table_id, title, **kwargs))

6 years, 2 months

skype: fix another infotext

by Moritz Kiemer

Module: check_mk Branch: master Commit: e0c60c5aa1ba570ee29196cb319cadf0652ce1d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0c60c5aa1ba57… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jul 13 13:05:14 2018 +0200 skype: fix another infotext Change-Id: I6a2c92f96867d9494615e70e00db7ce48bbeeae9 --- checks/skype | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/skype b/checks/skype index b7fc9c2..6bae956 100644 --- a/checks/skype +++ b/checks/skype @@ -563,7 +563,7 @@ def check_skype_mobile(item, params, parsed): else: # add a perfcounter with 0 sessions for all missing devices so we can # still properly build a combined graph for active sessions - yield 0, None, [("active_sessions_%s" % name.lower(), 0, None, None, None, None)] + yield 0, "", [("active_sessions_%s" % name.lower(), 0, None, None, None, None)] yield wmi_yield_raw_counter(parsed["LS:WEB - Throttling and Authentication"], item, "WEB - Total Requests In Processing",

6 years, 2 months

← Newer
1
...
21
22
23
24
25
26
27
...
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