Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f0cfa1d1b001258a71ba831698e76e87072ab13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f0cfa1d1b0012… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 1 12:36:14 2018 +0100 5873 IPMI Management board The management board of hosts can now be configured to be monitored via IPMI as alternative to the previous SNMP monitoring. To configure the IPMI management board for a host, you need to edit the host configuration. Set the addresss of the management board, choose IPMI as management board protocol and specify the IPMI credentials. After this, you should be able to find new services named "Management interface: ..." using the service discovery. To make your configuration a bit less explicit, you can specify the IPMI protocol and credentials on folders instead of specifying it explicit for each host. Another option is to use the ruleset "Management board config" to configure the credentials. But you will have to set at least the protocol on host/folders and the management board address for each host. Change-Id: Ia6c69343b4319855dc2ae138be2852df4d9ce844 --- .werks/5873 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.werks/5873 b/.werks/5873 new file mode 100644 index 0000000..a183b7b --- /dev/null +++ b/.werks/5873 @@ -0,0 +1,23 @@ +Title: IPMI Management board +Level: 2 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519903894 +Class: feature + +The management board of hosts can now be configured to be monitored via IPMI +as alternative to the previous SNMP monitoring. + +To configure the IPMI management board for a host, you need to edit the +host configuration. Set the addresss of the management board, choose IPMI +as management board protocol and specify the IPMI credentials. +After this, you should be able to find new services named "Management interface: ..." +using the service discovery. + +To make your configuration a bit less explicit, you can specify the IPMI protocol +and credentials on folders instead of specifying it explicit for each host. +Another option is to use the ruleset "Management board config" to configure the +credentials. But you will have to set at least the protocol on host/folders and +the management board address for each host.

6 years, 4 months

Fixed issues caused by recent data sources cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: f5b3ff1abdd24be4a83068be1d25424206451a03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5b3ff1abdd24b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 1 11:05:46 2018 +0100 Fixed issues caused by recent data sources cleanup Change-Id: Ib3625a8f15fe65f1170f39de8e6a97b4b569ebc9 --- cmk_base/automations/check_mk.py | 2 +- cmk_base/dump_host.py | 2 +- cmk_base/modes/check_mk.py | 2 +- tests/cmk_base/test_data_sources.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 314006f..ec1ae02 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -1080,7 +1080,7 @@ class AutomationDiagHost(Automation): source.set_port(agent_port) source.set_timeout(tcp_connect_timeout) - output += source.run_raw(hostname, ipaddress) + output += source.run_raw() return 0, output diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index 3824746..0715e9e 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -83,7 +83,7 @@ def dump_host(hostname): agenttypes = [] sources = data_sources.DataSources(hostname, ipaddress) for source in sources.get_data_sources(): - agenttypes.append(source.describe(hostname)) + agenttypes.append(source.describe()) if config.is_ping_host(hostname): agenttypes.append('PING only') diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 5313411..3f61657 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -354,7 +354,7 @@ def mode_dump_agent(hostname): for source in sources.get_data_sources(): if isinstance(source, data_sources.abstract.CheckMKAgentDataSource): - output += source.run_raw(hostname, ipaddress) + output += source.run_raw() # Show errors of problematic data sources for data_source, exceptions in data_sources.get_data_source_errors_of_host(hostname, ipaddress).items(): diff --git a/tests/cmk_base/test_data_sources.py b/tests/cmk_base/test_data_sources.py index ea9afb7..85c7093 100644 --- a/tests/cmk_base/test_data_sources.py +++ b/tests/cmk_base/test_data_sources.py @@ -110,7 +110,7 @@ def _patch_data_source_run(monkeypatch, **kwargs): } defaults.update(kwargs) - def run(self, hostname, ipaddress, get_raw_data=False): + def run(self, hostname=None, ipaddress=None, get_raw_data=False): assert self._may_use_cache_file == defaults["_may_use_cache_file"] assert self._no_cache == defaults["_no_cache"] assert self._max_cachefile_age == defaults["_max_cachefile_age"] @@ -477,7 +477,7 @@ def test_data_sources_of_hosts(clear_config_caches, monkeypatch): config.collect_hosttags() for hostname, host_attrs in hosts: - sources = cmk_base.data_sources.DataSources(hostname) + sources = cmk_base.data_sources.DataSources(hostname, "127.0.0.1") source_names = [ s.__class__.__name__ for s in sources.get_data_sources() ] assert host_attrs["sources"] == source_names, \ "Wrong sources for %s" % hostname

6 years, 4 months

Win-agent: split SectionEventlog::find_eventlogs

by Jukka Aro

Module: check_mk Branch: master Commit: 1f30af00f49bdbaa691acc0e7085738021849d95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f30af00f49bdb… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 1 12:11:14 2018 +0100 Win-agent: split SectionEventlog::find_eventlogs --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 87 ++++++++++++++++++------------ agents/windows/sections/SectionEventlog.h | 6 +++ 3 files changed, 59 insertions(+), 36 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 9f510cc..d3cf57b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3144 +3146 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 9632c5d..9bcd440 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -292,6 +292,12 @@ uint64_t SectionEventlog::outputEventlog(std::ostream &out, IEventLog &log, return lastReadId; } +void SectionEventlog::initStates() { + for (auto &state : _states) { + state.newly_discovered = false; + } +} + // Keeps memory of an event log we have found. It // might already be known and will not be stored twice. void SectionEventlog::registerEventlog(const std::string &logname) { @@ -307,39 +313,58 @@ void SectionEventlog::registerEventlog(const std::string &logname) { _states.push_back(eventlog::state(logname)); } +FindResult SectionEventlog::findLog(const HKeyHandle &hKey, DWORD index) const { + std::array<char, 128> buffer{}; + DWORD len = static_cast<DWORD>(buffer.size()); + return {_winapi.RegEnumKeyEx(hKey.get(), index, buffer.data(), &len, + nullptr, nullptr, nullptr, nullptr), + buffer.data()}; +} + +bool SectionEventlog::handleFindResult(const FindResult &result, + std::ostream &out) { + if (const auto & [ r, logname ] = result; r == ERROR_SUCCESS) { + registerEventlog(logname); + } else if (r != ERROR_MORE_DATA) { + if (r != ERROR_NO_MORE_ITEMS) { + out << "ERROR: Cannot enumerate over event logs: error " + "code " + << r << "\n"; + return false; + } + } + + return true; +} + +void SectionEventlog::registerVistaStyleLogs() { + // enable the vista-style logs if that api is enabled + if (*_vista_api) { + for (const auto &eventlog : *_config) { + if (eventlog.vista_api) { + registerEventlog(eventlog.name); + } + } + } +} + /* Look into the registry in order to find out, which event logs are available. */ bool SectionEventlog::find_eventlogs(std::ostream &out) { - for (auto &state : _states) { - state.newly_discovered = false; - } + initStates(); const std::string regpath{"SYSTEM\\CurrentControlSet\\Services\\Eventlog"}; HKEY key = nullptr; - DWORD ret = _winapi.RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath.c_str(), 0, - KEY_ENUMERATE_SUB_KEYS, &key); - HKeyHandle hKey{key, _winapi}; bool success = true; - if (ret == ERROR_SUCCESS) { - DWORD i = 0; - char buffer[128]; - DWORD len; - while (true) { - len = sizeof(buffer); - DWORD r = _winapi.RegEnumKeyEx(hKey.get(), i, buffer, &len, NULL, - NULL, NULL, NULL); - if (r == ERROR_SUCCESS) { - registerEventlog(buffer); - } else if (r != ERROR_MORE_DATA) { - if (r != ERROR_NO_MORE_ITEMS) { - out << "ERROR: Cannot enumerate over event logs: error " - "code " - << r << "\n"; - success = false; - } - break; - } - i++; + + if (DWORD r = _winapi.RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath.c_str(), 0, + KEY_ENUMERATE_SUB_KEYS, &key); + r == ERROR_SUCCESS) { + HKeyHandle hKey{key, _winapi}; + for (DWORD i = 0; r == ERROR_SUCCESS || r == ERROR_MORE_DATA; ++i) { + const auto result = findLog(hKey, i); + r = result.first; + success = handleFindResult(result, out) && success; } } else { success = false; @@ -348,15 +373,7 @@ bool SectionEventlog::find_eventlogs(std::ostream &out) { << " for enumeration: error code " << lastError << "\n"; } - // enable the vista-style logs if that api is enabled - if (*_vista_api) { - for (const auto &eventlog : *_config) { - if (eventlog.vista_api) { - registerEventlog(eventlog.name); - } - } - } - + registerVistaStyleLogs(); return success; } diff --git a/agents/windows/sections/SectionEventlog.h b/agents/windows/sections/SectionEventlog.h index fd48bae..2418bcd 100644 --- a/agents/windows/sections/SectionEventlog.h +++ b/agents/windows/sections/SectionEventlog.h @@ -93,6 +93,8 @@ public: eventlog::hint parseStateLine(const std::string &line); +using FindResult = std::pair<DWORD, std::string>; + class SectionEventlog : public Section { public: SectionEventlog(Configuration &config, Logger *logger, @@ -105,7 +107,11 @@ private: uint64_t outputEventlog(std::ostream &out, IEventLog &log, uint64_t previouslyReadId, eventlog::Level level, bool hideContext); + void initStates(); void registerEventlog(const std::string &logname); + FindResult findLog(const HKeyHandle &hKey, DWORD index) const; + bool handleFindResult(const FindResult &result, std::ostream &out); + void registerVistaStyleLogs(); bool find_eventlogs(std::ostream &out); void saveEventlogOffsets(const std::string &statefile); void readHintOffsets();

6 years, 4 months

Build Win-agent unit tests with common AM_CPPFLAGS

by Jukka Aro

Module: check_mk Branch: master Commit: 9fe9bc9de46a0ecf0d88b54519317212dd6ed05d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fe9bc9de46a0e… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 1 10:02:46 2018 +0100 Build Win-agent unit tests with common AM_CPPFLAGS The common flags were accidentally forgotten when building unit tests. Now it is possible to use, e. g., C++17 features also in unit tests. --- agents/windows/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 0d01e6f..70c2d62 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -11,7 +11,7 @@ LD_COMMON = -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi - check_mk_agent_LDADD = check_mk_agent.res libcheck_mk_agent.a $(LD_COMMON) -WindowsAgentTest_CPPFLAGS = -I$(top_srcdir)/sections -I$(top_srcdir)/test +WindowsAgentTest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/sections -I$(top_srcdir)/test WindowsAgentTest_LDADD = libcheck_mk_agent.a -lgtest -lgmock $(LD_COMMON) wmitest_LDADD = $(LD_COMMON)

6 years, 4 months

Win-agent: favor std::string over const char *

by Jukka Aro

Module: check_mk Branch: master Commit: 377e997e76a79b8228e62300aaf58754a6813c25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=377e997e76a79b… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 1 08:27:27 2018 +0100 Win-agent: favor std::string over const char * --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 13 ++++++------- agents/windows/sections/SectionEventlog.h | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 0e75b70..b2858f3 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3140 +3142 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 1cb3a5c..a0f2033 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -296,7 +296,7 @@ uint64_t SectionEventlog::outputEventlog(std::ostream &out, IEventLog &log, // Keeps memory of an event log we have found. It // might already be known and will not be stored twice. -void SectionEventlog::registerEventlog(const char *logname) { +void SectionEventlog::registerEventlog(const std::string &logname) { // check if we already know this one... for (auto &state : _states) { if (ci_equal(state.name, logname)) { @@ -316,11 +316,9 @@ bool SectionEventlog::find_eventlogs(std::ostream &out) { state.newly_discovered = false; } - char regpath[128]; - snprintf(regpath, sizeof(regpath), - "SYSTEM\\CurrentControlSet\\Services\\Eventlog"); + const std::string regpath{"SYSTEM\\CurrentControlSet\\Services\\Eventlog"}; HKEY key = nullptr; - DWORD ret = _winapi.RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, + DWORD ret = _winapi.RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath.c_str(), 0, KEY_ENUMERATE_SUB_KEYS, &key); HKeyHandle hKey{key, _winapi}; bool success = true; @@ -332,8 +330,9 @@ bool SectionEventlog::find_eventlogs(std::ostream &out) { len = sizeof(buffer); DWORD r = _winapi.RegEnumKeyEx(hKey.get(), i, buffer, &len, NULL, NULL, NULL, NULL); - if (r == ERROR_SUCCESS) + if (r == ERROR_SUCCESS) { registerEventlog(buffer); + } else if (r != ERROR_MORE_DATA) { if (r != ERROR_NO_MORE_ITEMS) { out << "ERROR: Cannot enumerate over event logs: error " @@ -356,7 +355,7 @@ bool SectionEventlog::find_eventlogs(std::ostream &out) { if (*_vista_api) { for (const auto &eventlog : *_config) { if (eventlog.vista_api) { - registerEventlog(eventlog.name.c_str()); + registerEventlog(eventlog.name); } } } diff --git a/agents/windows/sections/SectionEventlog.h b/agents/windows/sections/SectionEventlog.h index 13d489b..fd48bae 100644 --- a/agents/windows/sections/SectionEventlog.h +++ b/agents/windows/sections/SectionEventlog.h @@ -58,7 +58,7 @@ std::ostream &operator<<(std::ostream &out, const config &val); // which record entry we have seen its messages so // far. struct state { - state(const char *name) : name(name), newly_discovered(true) {} + state(const std::string &name) : name(name), newly_discovered(true) {} std::string name; uint64_t record_no{0}; bool newly_discovered; @@ -105,7 +105,7 @@ private: uint64_t outputEventlog(std::ostream &out, IEventLog &log, uint64_t previouslyReadId, eventlog::Level level, bool hideContext); - void registerEventlog(const char *logname); + void registerEventlog(const std::string &logname); bool find_eventlogs(std::ostream &out); void saveEventlogOffsets(const std::string &statefile); void readHintOffsets();

6 years, 4 months

Disable test for member: Pylint detects the wrong type

by Lars Michelsen

Module: check_mk Branch: master Commit: fcd469ad5fc191483e06eca19cfae3a86aff81ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcd469ad5fc191… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 1 10:10:35 2018 +0100 Disable test for member: Pylint detects the wrong type Change-Id: I51b9a94e15e54a594e06186b79b969b25339259b --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b1f10cc..7cf1158 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -575,7 +575,7 @@ class ModeFolder(WatoMode): c = wato_confirm(_("Confirm folder deletion"), msg) if c: - self._folder.delete_subfolder(subfolder_name) + self._folder.delete_subfolder(subfolder_name) # pylint: disable=no-member return "folder" elif c == False: # not yet confirmed return "" @@ -625,7 +625,7 @@ class ModeFolder(WatoMode): def _show_subfolders_of(self): if self._folder.has_subfolders(): html.open_div(class_="folders") # This won't hurt even if there are no visible subfolders - for subfolder in self._folder.visible_subfolders_sorted_by_title(): + for subfolder in self._folder.visible_subfolders_sorted_by_title(): # pylint: disable=no-member self._show_subfolder(subfolder) html.close_div() html.div('', class_="folder_foot")

6 years, 4 months

Refactored SNMP credentials handling and parameters of data sources methods to member variables

by Simon Betz

Module: check_mk Branch: master Commit: a2f66f9cdbddcf7bf3cdd6a629d3663c89b09002 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2f66f9cdbddcf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 20 10:38:53 2018 +0100 Refactored SNMP credentials handling and parameters of data sources methods to member variables Wrong SNMP credentials were used if one host has configured a SNMP management board. Change-Id: I916a82562565f41612749f14fc88ad12f5c81821 --- cmk_base/automations/check_mk.py | 20 +++-- cmk_base/check_table.py | 2 + cmk_base/checking.py | 6 +- cmk_base/checks.py | 65 ++++++++++++++ cmk_base/classic_snmp.py | 27 +++--- cmk_base/data_sources/__init__.py | 53 +++++++----- cmk_base/data_sources/abstract.py | 123 ++++++++++++++------------ cmk_base/data_sources/host_sections.py | 18 +++- cmk_base/data_sources/piggyback.py | 14 +-- cmk_base/data_sources/programs.py | 52 +++++------ cmk_base/data_sources/snmp.py | 100 +++++++++++++-------- cmk_base/data_sources/tcp.py | 36 ++++---- cmk_base/discovery.py | 154 ++++++++++----------------------- cmk_base/dump_host.py | 6 +- cmk_base/inventory.py | 8 +- cmk_base/modes/check_mk.py | 2 +- cmk_base/snmp.py | 96 ++++++++++++-------- 17 files changed, 442 insertions(+), 340 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a2f66f9cdb…

6 years, 4 months

Fixed issue introduced with recently added commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 577e926d3db65ad8d4694bf373f43f64adae4234 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=577e926d3db65a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 1 10:08:08 2018 +0100 Fixed issue introduced with recently added commit Change-Id: I3f36937798763bf2554e504e564004941c5e47e7 --- web/htdocs/metrics.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 48294bc..74269dc 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -98,6 +98,7 @@ def load_plugins(force): fixup_graph_info() fixup_unit_info() fixup_perfometer_info() + loaded_with_language = current_language def fixup_graph_info():

6 years, 4 months

Win-agent: use C++17 structured bindings

by Jukka Aro

Module: check_mk Branch: master Commit: 573d0b60deb159ab6274046bb1a72da98b9481f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=573d0b60deb159… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 1 10:05:47 2018 +0100 Win-agent: use C++17 structured bindings TODO: complete when we upgrade to a gcc version supporting [[maybe_unused]] Also use auto specifier in some for loops where this was not done. --- agents/windows/Configurable.h | 4 ++-- agents/windows/Configuration.cc | 11 +++++------ agents/windows/Environment.cc | 6 +++--- agents/windows/EventLogVista.cc | 5 ++--- agents/windows/ListenSocket.cc | 11 ++++++----- agents/windows/OHMMonitor.h | 2 +- agents/windows/SectionManager.cc | 14 ++++++-------- agents/windows/build_version | 2 +- agents/windows/dynamic_func.h | 16 ++++++++-------- agents/windows/sections/SectionCheckMK.cc | 4 ++-- agents/windows/sections/SectionEventlog.cc | 21 ++++++++------------- agents/windows/sections/SectionLogwatch.cc | 9 +++++---- agents/windows/sections/SectionMRPE.cc | 4 +--- agents/windows/sections/SectionMem.cc | 5 ++--- agents/windows/sections/SectionPerfcounter.cc | 13 ++++++------- agents/windows/sections/SectionPluginGroup.cc | 24 ++++++++++++------------ agents/windows/sections/SectionWinperf.h | 2 +- agents/windows/win_error.cc | 10 +++++----- 18 files changed, 76 insertions(+), 87 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=573d0b60de…

6 years, 4 months

Revert "Fixed pylint imports from site specific paths"

by Lars Michelsen

Module: check_mk Branch: master Commit: e2a991c8f550915aa155e9b8952e7eaea583f1a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2a991c8f55091… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 1 09:20:31 2018 +0100 Revert "Fixed pylint imports from site specific paths" This reverts commit b4af2add3bae8f4317087e9e3a494358beb031ed. --- tests/testlib/pylint_cmk.py | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index c989066..c73a329 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -10,7 +10,6 @@ import tempfile from pylint.reporters.text import ColorizedTextReporter, ParseableTextReporter from pylint.utils import Message -from pylint.lint import Run from testlib import repo_path, cmk_path, cmc_path, cme_path @@ -40,6 +39,8 @@ def add_file(f, path): def run_pylint(base_path, check_files=None): #, cleanup_test_dir=False): pylint_args = os.environ.get("PYLINT_ARGS", "") + if pylint_args: + pylint_args += " " pylint_cfg = repo_path() + "/pylintrc" @@ -49,25 +50,10 @@ def run_pylint(base_path, check_files=None): #, cleanup_test_dir=False): return 0 # nothing to do os.putenv("TEST_PATH", repo_path() + "/tests") - - args = [] - if pylint_args: - args += pylint_args.split(" ") - - args += [ "--rcfile=%s" % pylint_cfg ] - args += check_files - - print("Running pylint in %r with args: %r" % (base_path, args)) - - try: - orig_wd = os.getcwd() - os.chdir(base_path) - - run = Run(args, exit=False) - exit_code = run.linter.msg_status - finally: - os.chdir(orig_wd) - + cmd = "pylint --rcfile=\"%s\" %s%s" % (pylint_cfg, pylint_args, " ".join(check_files)) + print("Running pylint with: %s" % cmd) + p = subprocess.Popen(cmd, shell=True, cwd=base_path) + exit_code = p.wait() print("Finished with exit code: %d" % exit_code) #if exit_code == 0 and cleanup_test_dir:

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018