Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 8bb9e2cafbd79d19813db80f74c2ce60b836dbaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bb9e2cafbd79d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 17:02:12 2019 +0200 Fixed mocked function Change-Id: Id80ebe33dce7e02b86a2673c788c6a70bf1073fd --- tests/unit/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index e1e4fc8..81f51ba 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -17,7 +17,7 @@ def site(request): @pytest.fixture() def fixup_ip_lookup(monkeypatch): # Fix IP lookup when - def _getaddrinfo(hostname, family): + def _getaddrinfo(host, port, family=None, socktype=None, proto=None, flags=None): if family == socket.AF_INET: return "0.0.0.0" raise NotImplementedError()

5 years, 1 month

[CMK-1971] - installation fix and lesser refactoring corresponding APU with enum class

by Sergey Kipnis

Module: check_mk Branch: master Commit: 024e4ec52aa7c88116e0edde772ea6156ca9993a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=024e4ec52aa7c8… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Thu May 2 14:14:17 2019 +0200 [CMK-1971] - installation fix and lesser refactoring corresponding APU with enum class Change-Id: Id60329e9afc896b960f25df2351f88f0a5b43efe --- agents/wnx/src/engine/install_api.cpp | 46 ++++++++++++++++---------------- agents/wnx/src/engine/install_api.h | 19 ++++++------- agents/wnx/src/main/check_mk_service.cpp | 10 +++---- agents/wnx/watest/test-install-auto.cpp | 14 +++++----- 4 files changed, 46 insertions(+), 43 deletions(-) diff --git a/agents/wnx/src/engine/install_api.cpp b/agents/wnx/src/engine/install_api.cpp index cd478b2..2fca605 100644 --- a/agents/wnx/src/engine/install_api.cpp +++ b/agents/wnx/src/engine/install_api.cpp @@ -3,22 +3,21 @@ #include "stdafx.h" +#include "install_api.h" + #include <filesystem> #include <string> -#include "common/wtools.h" // converts -#include "tools/_process.h" // start process - #include "cfg.h" +#include "common/wtools.h" // converts #include "logger.h" - -#include "install_api.h" +#include "tools/_process.h" // start process namespace cma { namespace install { -std::filesystem::path MakeTempFileNameInTempPath(const std::wstring& Name) { +std::filesystem::path MakeTempFileNameInTempPath(std::wstring_view Name) { namespace fs = std::filesystem; // Find Temporary Folder fs::path temp_folder = cma::tools::win::GetTempFolder(); @@ -136,10 +135,9 @@ bool NeedInstall(const std::filesystem::path& IncomingFile, // check that update exists and exec it // returns true when update found and ready to exec -bool CheckForUpdateFile(const std::wstring& Name, - const std::wstring& DirWithMsi, UpdateType Update, - bool StartUpdateProcess, - const std::wstring& BackupPath) { +bool CheckForUpdateFile(std::wstring_view Name, std::wstring_view DirWithMsi, + UpdateType Update, UpdateProcess StartUpdateProcess, + std::wstring_view BackupPath) { namespace fs = std::filesystem; // find path to msiexec, in Windows it is in System32 folder @@ -153,11 +151,11 @@ bool CheckForUpdateFile(const std::wstring& Name, if (!fs::exists(msi_base, ec)) return false; // this is ok switch (Update) { - case kMsiExec: - case kMsiExecQuiet: + case UpdateType::exec_normal: + case UpdateType::exec_quiet: break; - default: - XLOG::l("Invalid Option {}", Update); + default: // safety, MSVC give us no warning + XLOG::l("Invalid Option '{}'", static_cast<int>(Update)); return false; } @@ -176,20 +174,22 @@ bool CheckForUpdateFile(const std::wstring& Name, BackupFile(msi_to_install, BackupPath); // Prepare Command - std::wstring command = exe + L" "; - // original line includes also command REINSTALL=ALL - // this doesn't work well when you have more than one FEATURE(new agent) - // and no defined REINSTALL in the MSI - command = - command + L" /i " + msi_to_install.wstring() + L" REINSTALLMODE=amus "; - if (Update == kMsiExecQuiet) // this is only normal method - command += L" /quiet"; // but MS doesn't care at all :) + std::wstring command = exe; + + // msiexecs' parameters below are not fixed unfortunately + // documentation is scarce and method of installation in MK + // is not a special standard + command += L" /i " + msi_to_install.wstring() + + L" REINSTALL=ALL REINSTALLMODE=amus "; + + if (Update == UpdateType::exec_quiet) // this is only normal method + command += L" /quiet"; // but MS doesn't care at all :) XLOG::l.i("File '{}' exists\n Command is '{}'", msi_to_install.u8string(), wtools::ConvertToUTF8(command.c_str())); - if (!StartUpdateProcess) { + if (StartUpdateProcess == UpdateProcess::skip) { XLOG::l.i("Actual Updating is disabled"); return true; } diff --git a/agents/wnx/src/engine/install_api.h b/agents/wnx/src/engine/install_api.h index e25b52f..7e3146d 100644 --- a/agents/wnx/src/engine/install_api.h +++ b/agents/wnx/src/engine/install_api.h @@ -7,23 +7,24 @@ #include <filesystem> #include <string> +#include <string_view> namespace cma { namespace install { -enum UpdateType { kMsiExec, kMsiExecQuiet }; -constexpr const wchar_t* const kDefaultMsiFileName = L"check_mk_agent.msi"; +enum class UpdateType { exec_normal, exec_quiet }; +enum class UpdateProcess { execute, skip }; +constexpr const std::wstring_view kDefaultMsiFileName = L"check_mk_agent.msi"; // TEST(InstallAuto, TopLevel) -// StartUpdateProcess == false when we only testing functionality +// set StartUpdateProcess to 'skip' to test functionality // BackupPath may be empty, normally points out on the install folder // DirWithMsi is update dir in ProgramData -bool CheckForUpdateFile(const std::wstring& Name, - const std::wstring& DirWithMsi, UpdateType Update, - bool StartUpdateProcess, - const std::wstring& BackupPath = L""); +bool CheckForUpdateFile(std::wstring_view Name, std::wstring_view DirWithMsi, + UpdateType Update, UpdateProcess StartUpdateProcess, + std::wstring_view BackupPath = L""); -std::filesystem::path MakeTempFileNameInTempPath(const std::wstring& Name); +std::filesystem::path MakeTempFileNameInTempPath(std::wstring_view Name); // internal API with diag published to simplify testing or for later use // **************************************** @@ -41,7 +42,7 @@ bool MvFile(const std::filesystem::path& Old, void BackupFile(const std::filesystem::path& File, const std::filesystem::path& Dir) noexcept; -// noexcept check whther incoming file is newer +// noexcept check whether incoming file is newer bool NeedInstall(const std::filesystem::path& IncomingFile, const std::filesystem::path& BackupDir) noexcept; // **************************************** diff --git a/agents/wnx/src/main/check_mk_service.cpp b/agents/wnx/src/main/check_mk_service.cpp index ba94357..fd61e4a 100644 --- a/agents/wnx/src/main/check_mk_service.cpp +++ b/agents/wnx/src/main/check_mk_service.cpp @@ -197,11 +197,11 @@ int MainFunction(int argc, wchar_t const *Argv[]) { // this part of code have to be tested manually // scripting is possible but complicated CheckForUpdateFile( - kDefaultMsiFileName, // file we are looking for - GetUpdateDir(), // dir where file we're searching - UpdateType::kMsiExecQuiet, // quiet for production - true, // start update when file found - GetMsiBackupDir()); // dir where file to backup + kDefaultMsiFileName, // file we are looking for + GetUpdateDir(), // dir where file we're searching + UpdateType::exec_quiet, // quiet for production + UpdateProcess::execute, // start update when file found + GetMsiBackupDir()); // dir where file to backup return true; }); } diff --git a/agents/wnx/watest/test-install-auto.cpp b/agents/wnx/watest/test-install-auto.cpp index 0d06c39..f2e332c 100644 --- a/agents/wnx/watest/test-install-auto.cpp +++ b/agents/wnx/watest/test-install-auto.cpp @@ -7,10 +7,8 @@ #include <fstream> #include "common/wtools.h" - #include "install_api.h" #include "service_processor.h" - #include "test-tools.h" TEST(InstallAuto, LowLevel) { @@ -86,16 +84,20 @@ TEST(InstallAuto, TopLevel) { auto to_install = MakeTempFileNameInTempPath(name); EXPECT_TRUE(!to_install.empty()); { - auto result = CheckForUpdateFile(name, in, (UpdateType)535, false); + auto result = CheckForUpdateFile(name, in.wstring(), (UpdateType)535, + UpdateProcess::skip); EXPECT_FALSE(result); - result = CheckForUpdateFile(name, L"", kMsiExecQuiet, false); + result = CheckForUpdateFile(name, L"", UpdateType::exec_quiet, + UpdateProcess::skip); EXPECT_FALSE(result); - result = CheckForUpdateFile(L"invalidname", L"", kMsiExecQuiet, false); + result = CheckForUpdateFile(L"invalidname", L"", UpdateType::exec_quiet, + UpdateProcess::skip); EXPECT_FALSE(result); - result = CheckForUpdateFile(name, in, kMsiExecQuiet, false, out); + result = CheckForUpdateFile(name, in.wstring(), UpdateType::exec_quiet, + UpdateProcess::skip, out.wstring()); EXPECT_TRUE(result); EXPECT_TRUE(fs::exists(to_install, ec));

5 years, 1 month

Do not call scripts from /bauwelt and EDITION=cee

by Alex Zurhake

Module: check_mk Branch: master Commit: d8a19e1867e53cd5e6487eeb662b111d0deaaf03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8a19e1867e53c… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu May 2 08:24:02 2019 +0200 Do not call scripts from /bauwelt and EDITION=cee Change-Id: Ic37908609f7b990b1a943e79eb90f956b16bd1e0 --- buildscripts/scripts/nightly-build.jenkins | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 4ec218f..b8e268a 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -254,8 +254,8 @@ node { stage('Packaging Tests') { try { dir("${DAILY_DATA}/git/tests") { - withEnv(["VERSION_PATH=i${ARCHIVE_DIR}", "PYTEST_ADDOPTS='--junitxml=\"${WORKSPACE}/junit.xml\"'"]) { - sh ". /bauwelt/bin/bw-setup-jenkins-env ; make test-packaging" + withEnv(["VERSION_PATH=${ARCHIVE_DIR}", "PYTEST_ADDOPTS='--junitxml=\"${WORKSPACE}/junit.xml\"'", "EDITION=cee"]) { + sh "make test-packaging" } } } finally {

5 years, 1 month

README was renamed to README.md

by Alex Zurhake

Module: check_mk Branch: master Commit: c584ec4c25c3845753c3b712a8661a4efb392912 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c584ec4c25c384… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu May 2 15:18:33 2019 +0200 README was renamed to README.md Change-Id: I498a20ed72b6521a1279d11ed12b6b0e81512bab --- tests/packaging/test_files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index fe8aec1..90b615c 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -69,7 +69,7 @@ def test_files_not_in_version_path(version_path, what): "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/COPYING.gz$", "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/TEAM$", "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/copyright$", - "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/README$", + "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/README.md$", "/etc/$", "/etc/init.d/$", "/etc/init.d/check-mk-(raw|enterprise|managed)-.*$",

5 years, 1 month

Replace equality operators in checks

by Florian Kromer

Module: check_mk Branch: master Commit: deab0e3e822a5d3bdc615740dee29467d0f77988 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=deab0e3e822a5d… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu May 2 14:14:14 2019 +0200 Replace equality operators in checks The comparison operators <> and != are alternative spellings of the same operator. != is the preferred spelling; <> is obsolescent in Python 3. Change-Id: I57649b8fbe971ad01df413cbe620d410772eac96 --- checks/oracle_asm_diskgroup | 6 +++--- checks/oracle_dataguard_stats | 6 +++--- checks/oracle_instance | 6 +++--- checks/oracle_locks | 2 +- checks/vnx_quotas | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup index c8d36d0..773a5f6 100644 --- a/checks/oracle_asm_diskgroup +++ b/checks/oracle_asm_diskgroup @@ -119,10 +119,10 @@ def parse_oracle_asm_diskgroup(info): if first_node == '': first_node = node_name - elif first_node <> node_name: + elif first_node != node_name: continue - if len(stripped_line) <> 12: + if len(stripped_line) != 12: # old format without fg data parsed.setdefault( @@ -323,7 +323,7 @@ def check_oracle_asm_diskgroup(item, params, parsed): infotext += ', %i disks' % dg_disks - if dgtype <> 'EXTERN': + if dgtype != 'EXTERN': # EXTERN Redundancy has only 1 FG. => useless information infotext += ' in %i failgroups' % fg_count diff --git a/checks/oracle_dataguard_stats b/checks/oracle_dataguard_stats index 389628b..272328d 100644 --- a/checks/oracle_dataguard_stats +++ b/checks/oracle_dataguard_stats @@ -113,9 +113,9 @@ def check_oracle_dataguard_stats(item, params, parsed): yield 0, "Broker %s" % (dgdata['broker_state'].lower()) # Observer is only usable with enabled Fast Start Failover! - if 'fs_failover_status' in dgdata and dgdata['fs_failover_status'] <> 'DISABLED': + if 'fs_failover_status' in dgdata and dgdata['fs_failover_status'] != 'DISABLED': - if dgdata['fs_failover_observer_present'] <> 'YES': + if dgdata['fs_failover_observer_present'] != 'YES': yield 2, "Observer not connected" else: yield 0, "Observer connected %s from host %s" % ( @@ -210,7 +210,7 @@ def check_oracle_dataguard_stats(item, params, parsed): yield 0, '%s %s' % (dgstat_param, get_age_human_readable(seconds)), perfdata else: if seconds is None: - # seconds is None => state <> 0 from upper checks + # seconds is None => state != 0 from upper checks yield state, '%s unknown time' % (dgstat_param), perfdata else: yield state, '%s %s %s' % (dgstat_param, get_age_human_readable(seconds), diff --git a/checks/oracle_instance b/checks/oracle_instance index c9e70cb..2554dbc 100644 --- a/checks/oracle_instance +++ b/checks/oracle_instance @@ -57,9 +57,9 @@ def inventory_oracle_instance(info): # possible multitenant entry? if len(line) > 12: - # every pdb has a con_id <> 0 + # every pdb has a con_id != 0 # Multitenant use DB_NAME.PDB_NAME as Service - if line[12] == ('TRUE') and line[13] <> '0': + if line[12] == ('TRUE') and line[13] != '0': inv_list.append((("%s.%s" % (line[0], line[14])), {})) continue @@ -99,7 +99,7 @@ def check_oracle_instance(item, params, info): if len(line) > 12: # Multitenant! - if line[12] == ('TRUE') and line[13] <> '0': + if line[12] == ('TRUE') and line[13] != '0': itemname = ("%s.%s" % (line[0], line[14])) pdb = True diff --git a/checks/oracle_locks b/checks/oracle_locks index 6f41f7f..8f04d67 100644 --- a/checks/oracle_locks +++ b/checks/oracle_locks @@ -92,7 +92,7 @@ def check_oracle_locks(item, params, info): elif lockcount > 10: infotext = 'more then 10 locks existing!' - if state <> -1: + if state != -1: return (state, infotext) # In case of missing information we assume that the login into diff --git a/checks/vnx_quotas b/checks/vnx_quotas index 8bb3b74..1b52c56 100644 --- a/checks/vnx_quotas +++ b/checks/vnx_quotas @@ -82,7 +82,7 @@ def parse_vnx_quotas(info): parsed["fs"].setdefault(stripped_entries[0], {"data": stripped_entries[1].split(",")}) elif section == "quotas": - if len(stripped_entries) <> 5: + if len(stripped_entries) != 5: continue dms, fs, mp, used_str, limit_str = stripped_entries

5 years, 1 month

Fix some IP resolve related unit tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 145ff86ee4df50ffd09fac0476b403e8d39725fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=145ff86ee4df50… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 13:55:07 2019 +0200 Fix some IP resolve related unit tests Change-Id: I86599b213f84edbc0303c9e8d5d1652f7684d7be --- tests/unit/cmk_base/test_core_config.py | 3 ++- tests/unit/conftest.py | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tests/unit/cmk_base/test_core_config.py b/tests/unit/cmk_base/test_core_config.py index f51e76c..5d9a0af 100644 --- a/tests/unit/cmk_base/test_core_config.py +++ b/tests/unit/cmk_base/test_core_config.py @@ -1,5 +1,6 @@ # encoding: utf-8 import pytest # type: ignore +import socket from testlib.base import Scenario from cmk.utils.exceptions import MKGeneralException @@ -19,7 +20,7 @@ def test_active_check_arguments(mocker): assert prepare_check_command.called_once() -def test_get_host_attributes(monkeypatch): +def test_get_host_attributes(fixup_ip_lookup, monkeypatch): ts = Scenario().add_host("test-host", ["abc"]) ts.set_option("host_tags", { "test-host": { diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 02c0ef1..e1e4fc8 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -1,4 +1,5 @@ -import pytest +import socket +import pytest # type: ignore # Unit tests should not be executed in site. @@ -6,3 +7,19 @@ import pytest @pytest.fixture(scope="session") def site(request): pass + + +# TODO: This fixes our unit tests when executing the tests while the local +# resolver uses a search domain which uses wildcard resolution. e.g. in a +# network where mathias-kettner.de is in the domain search list and +# [anything].mathias-kettner.de resolves to an IP address. +# Clean this up once we don't have this situation anymore e.g. via VPN. +(a)pytest.fixture() +def fixup_ip_lookup(monkeypatch): + # Fix IP lookup when + def _getaddrinfo(hostname, family): + if family == socket.AF_INET: + return "0.0.0.0" + raise NotImplementedError() + + monkeypatch.setattr(socket, "getaddrinfo", _getaddrinfo)

5 years, 1 month

Move flap settings ruleset processing to HostConfig/ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: 28bd34ff86216b8d511a3c70eb82646a660961e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28bd34ff86216b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 26 07:55:44 2019 +0200 Move flap settings ruleset processing to HostConfig/ConfigCache CMK-2030 Change-Id: If0b606a799cb5584e35c7de6e9247a4ee01e020b --- cmk_base/config.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index 3af05ac..2294a81 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3627,6 +3627,14 @@ class CEEConfigCache(ConfigCache): # type: (str, Text) -> List[Dict[str, Union[int, str]]] return self.service_extra_conf(hostname, description, service_recurring_downtimes) + def flap_settings_of_service(self, hostname, description): + # type: (str, Text) -> Tuple[float, float, float] + values = self.service_extra_conf(hostname, description, cmc_service_flap_settings) + if not values: + return cmc_flap_settings + + return values[0] + # TODO: Find a clean way to move this to cmk_base.cee. This will be possible once the # configuration settings are not held in cmk_base.config namespace anymore. @@ -3645,3 +3653,12 @@ class CEEHostConfig(HostConfig): def recurring_downtimes(self): # type: () -> List[Dict[str, Union[int, str]]] return self._config_cache.host_extra_conf(self.hostname, host_recurring_downtimes) + + @property + def flap_settings(self): + # type: () -> Tuple[float, float, float] + values = self._config_cache.host_extra_conf(self.hostname, cmc_host_flap_settings) + if not values: + return cmc_flap_settings + + return values[0]

5 years, 1 month

Move state translation ruleset processing to HostConfig/ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: d910c5a8b2ba8cd08fa98d141b8207fba8871e0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d910c5a8b2ba8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 26 08:43:04 2019 +0200 Move state translation ruleset processing to HostConfig/ConfigCache CMK-2030 Change-Id: I9d6eee3400e21138a49fc08630e9d6beac4438d7 --- cmk_base/config.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index 943dd7c..68ab3ad 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3643,6 +3643,15 @@ class CEEConfigCache(ConfigCache): return False return entries[0] + def state_translation_of_service(self, hostname, description): + # type: (str, Text) -> Dict + entries = self.service_extra_conf(hostname, description, service_state_translation) + + spec = {} # type: Dict + for entry in entries[::-1]: + spec.update(entry) + return spec + # TODO: Find a clean way to move this to cmk_base.cee. This will be possible once the # configuration settings are not held in cmk_base.config namespace anymore. @@ -3679,3 +3688,13 @@ class CEEHostConfig(HostConfig): if not entries: return False return entries[0] + + @property + def state_translation(self): + # type: () -> Dict + entries = self._config_cache.host_extra_conf(self.hostname, host_state_translation) + + spec = {} # type: Dict + for entry in entries[::-1]: + spec.update(entry) + return spec

5 years, 1 month

Move smartping setting ruleset processing to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ce9e14c8f2f2b8b6bc25335d0f842657cc09b65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ce9e14c8f2f2b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 26 08:50:25 2019 +0200 Move smartping setting ruleset processing to HostConfig CMK-2030 Change-Id: I0ed87fbc2e76fa5034cc815ab108bf0929a6b584 --- cmk_base/config.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index 68ab3ad..e872690 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3698,3 +3698,11 @@ class CEEHostConfig(HostConfig): for entry in entries[::-1]: spec.update(entry) return spec + + @property + def smartping_settings(self): + # type: () -> Dict + settings = {"timeout": 2.5} + settings.update( + self._config_cache.host_extra_conf_merged(self.hostname, cmc_smartping_settings)) + return settings

5 years, 1 month

Separate CEE specific ConfigCache/HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 3cf18f194f29ff6ffc6faab164e9e3939d6e145c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cf18f194f29ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 25 21:21:04 2019 +0200 Separate CEE specific ConfigCache/HostConfig The CEE specific configuration settings should only be available when using CEE/CME and should be located below cmk_base.cee in the module hierarchy. Currently this can not be done easily. The best we can do at the moment is to separate them into dedicated classes which can then be moved over later. CMK-2030 Change-Id: If7fe3973986c995af361e8929302860f1ab72c3b --- cmk_base/config.py | 51 ++++++++++++++++++++++++-------------- tests/unit/cmk_base/test_config.py | 50 ++++++++----------------------------- 2 files changed, 43 insertions(+), 58 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 845c0d8..92681db 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -38,6 +38,7 @@ from typing import Set, Text, Any, Callable, Dict, List, Tuple, Union, Optional import six +import cmk import cmk.utils.debug import cmk.utils.paths from cmk.utils.regex import regex, is_regex @@ -2746,14 +2747,6 @@ class HostConfig(object): return list(set(cgrs)) @property - def rrd_config(self): - # type: () -> Optional[Dict] - entries = self._config_cache.host_extra_conf(self.hostname, cmc_host_rrd_config) - if not entries: - return None - return entries[0] - - @property def management_address(self): # type: () -> Optional[str] attributes_of_host = host_attributes.get(self.hostname, {}) @@ -2986,7 +2979,8 @@ class ConfigCache(object): if host_config: return host_config - host_config = self._host_configs[hostname] = HostConfig(self, hostname) + config_class = HostConfig if cmk.is_raw_edition() else CEEHostConfig + host_config = self._host_configs[hostname] = config_class(self, hostname) return host_config def _collect_hosttags(self): @@ -3057,14 +3051,6 @@ class ConfigCache(object): return match_object - def rrd_config_of_service(self, hostname, description): - # type: (str, Text) -> Optional[Dict] - rrdconf = self.service_extra_conf(hostname, description, cmc_service_rrd_config) - if not rrdconf: - return None - - return rrdconf[0] - def set_all_processed_hosts(self, all_processed_hosts): self._all_processed_hosts = set(all_processed_hosts) @@ -3617,5 +3603,34 @@ def get_config_cache(): # type: () -> ConfigCache config_cache = cmk_base.config_cache.get_dict("config_cache") if not config_cache: - config_cache["cache"] = ConfigCache() + cache_class = ConfigCache if cmk.is_raw_edition() else CEEConfigCache + config_cache["cache"] = cache_class() return config_cache["cache"] + + +# TODO: Find a clean way to move this to cmk_base.cee. This will be possible once the +# configuration settings are not held in cmk_base.config namespace anymore. +class CEEConfigCache(ConfigCache): + """Encapsulates the CEE specific functionality""" + + def rrd_config_of_service(self, hostname, description): + # type: (str, Text) -> Optional[Dict] + rrdconf = self.service_extra_conf(hostname, description, cmc_service_rrd_config) + if not rrdconf: + return None + + return rrdconf[0] + + +# TODO: Find a clean way to move this to cmk_base.cee. This will be possible once the +# configuration settings are not held in cmk_base.config namespace anymore. +class CEEHostConfig(HostConfig): + """Encapsulates the CEE specific functionality""" + + @property + def rrd_config(self): + # type: () -> Optional[Dict] + entries = self._config_cache.host_extra_conf(self.hostname, cmc_host_rrd_config) + if not entries: + return None + return entries[0] diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index b2d0105..455680e 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -711,26 +711,6 @@ def test_host_config_contactgroups(monkeypatch, hostname, result): @pytest.mark.parametrize("hostname,result", [ - ("testhost1", None), - ("testhost2", { - "1": 1 - }), -]) -def test_host_config_rrd_config(monkeypatch, hostname, result): - ts = Scenario().add_host(hostname) - ts.set_ruleset("cmc_host_rrd_config", [ - ({ - "1": 1 - }, [], ["testhost2"], {}), - ({ - "2": 2 - }, [], ["testhost2"], {}), - ]) - config_cache = ts.apply(monkeypatch) - assert config_cache.get_host_config(hostname).rrd_config == result - - -(a)pytest.mark.parametrize("hostname,result", [ ("testhost1", {}), ("testhost2", { 'empty_output': 1 @@ -1039,31 +1019,21 @@ def test_labels_of_service(monkeypatch): } -(a)pytest.mark.parametrize("hostname,result", [ - ("testhost1", None), - ("testhost2", { - "1": 1 - }), +(a)pytest.mark.parametrize("edition_short,expected_cache_class_name,expected_host_class_name", [ + ("cme", "CEEConfigCache", "CEEHostConfig"), + ("cee", "CEEConfigCache", "CEEHostConfig"), + ("cre", "ConfigCache", "HostConfig"), ]) -def test_config_cache_rrd_config_of_service(monkeypatch, hostname, result): - ts = Scenario().add_host(hostname) - ts.set_ruleset("cmc_service_rrd_config", [ - ({ - "1": 1 - }, [], ["testhost2"], ["CPU load$"], {}), - ({ - "2": 2 - }, [], ["testhost2"], ["CPU load$"], {}), - ]) - config_cache = ts.apply(monkeypatch) - assert config_cache.rrd_config_of_service(hostname, "CPU load") == result - +def test_config_cache_get_host_config(monkeypatch, edition_short, expected_cache_class_name, + expected_host_class_name): + monkeypatch.setattr(cmk, "edition_short", lambda: edition_short) -def test_config_cache_get_host_config(): - cache = config.ConfigCache() + cache = config.get_config_cache() + assert cache.__class__.__name__ == expected_cache_class_name assert cache._host_configs == {} host_config = cache.get_host_config("xyz") + assert host_config.__class__.__name__ == expected_host_class_name assert isinstance(host_config, config.HostConfig) assert host_config is cache.get_host_config("xyz")

5 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2019