Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

5550 FIX mk_oracle.ps1: Fixed exceptions because of useless backslashes

by Marcel Arentz

Module: check_mk Branch: master Commit: 95924dc8ec02f1ae3cebe9d0c3fa30025a06c504 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95924dc8ec02f1… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Nov 23 12:10:21 2017 +0100 5550 FIX mk_oracle.ps1: Fixed exceptions because of useless backslashes There has been a bug introduced as part of an feature enhancement which caused an exception of the plugin and prevented the execution. This Bug has been introduced in June 16th and is solved now. Change-Id: I77e7bc779b5596b6fb47c23b3afa84ff766c54b7 --- .werks/5550 | 12 ++++++++++++ agents/windows/plugins/mk_oracle.ps1 | 10 +++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/5550 b/.werks/5550 new file mode 100644 index 0000000..fd15a0b --- /dev/null +++ b/.werks/5550 @@ -0,0 +1,12 @@ +Title: mk_oracle.ps1: Fixed exceptions because of useless backslashes +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511435209 +Class: fix + +There has been a bug introduced as part of a feature enhancement which +caused an exception of the plugin and prevented the execution. This bug has +been introduced in June 16th and is solved now. diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index 078e643..f0558ae 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -1108,7 +1108,7 @@ select upper(i.instance_name) || '|' || logswitches from v$instance i , (select count(1) logswitches - from v\$loghist h , v\$instance i + from v$loghist h , v$instance i where h.first_time > sysdate - 1/24 and h.thread# = i.instance_number) ; @@ -1145,15 +1145,15 @@ Function sql_locks { || '|' || bs.process || '|' || bs.osuser || '|' || bs.username - from v\$session b - join v\$instance i on 1=1 - join gv\$session bs on bs.inst_id = b.BLOCKING_INSTANCE + from v$session b + join v$instance i on 1=1 + join gv$session bs on bs.inst_id = b.BLOCKING_INSTANCE and bs.sid = b.BLOCKING_SESSION where b.BLOCKING_SESSION is not null ; select upper(i.instance_name) || '|||||||||||||||||' - from v\$instance i + from v$instance i ; '@ echo $query_locks

6 years, 11 months

Windows agent: use RAII for mounted search handle

by Jukka Aro

Module: check_mk Branch: master Commit: 85bd51546c4f6b4adc862267a34374c50b0c0693 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85bd51546c4f6b… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Dec 22 12:14:42 2017 +0100 Windows agent: use RAII for mounted search handle Change-Id: Ia191e537f4a9f83443639e9c024c8ded9bbbbeb4 --- agents/windows/build_version | 2 +- agents/windows/sections/SectionDF.cc | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 4dd9c1b..488b08b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3034 +3036 diff --git a/agents/windows/sections/SectionDF.cc b/agents/windows/sections/SectionDF.cc index 4e8cc9a..919f266 100644 --- a/agents/windows/sections/SectionDF.cc +++ b/agents/windows/sections/SectionDF.cc @@ -28,6 +28,18 @@ #include "Logger.h" #include "WinApiAdaptor.h" #include "stringutil.h" +#include "types.h" + +namespace { + +struct MountPointHandleTraits { + using HandleT = HANDLE; + static HandleT invalidValue() { return INVALID_HANDLE_VALUE; } + + static void closeHandle(HandleT value, const WinApiAdaptor &winapi) { + winapi.FindVolumeMountPointClose(value); + } +}; void char_replace(char what, char into, char *in) { while (*in) { @@ -36,6 +48,8 @@ void char_replace(char what, char into, char *in) { } } +} // namespace + SectionDF::SectionDF(const Environment &env, Logger *logger, const WinApiAdaptor &winapi) : Section("df", "df", env, logger, winapi) { @@ -77,19 +91,21 @@ void SectionDF::output_filesystem(std::ostream &out, char *volid) { void SectionDF::output_mountpoints(std::ostream &out, char *volid) { char mountpoint[512]; - HANDLE hPt = _winapi.FindFirstVolumeMountPoint(volid, mountpoint, - sizeof(mountpoint)); - if (hPt != INVALID_HANDLE_VALUE) { + WrappedHandle<MountPointHandleTraits> hPt{ + _winapi.FindFirstVolumeMountPoint(volid, mountpoint, + sizeof(mountpoint)), + _winapi}; + + if (hPt) { while (true) { char combined_path[1024]; snprintf(combined_path, sizeof(combined_path), "%s%s", volid, mountpoint); output_filesystem(out, combined_path); - if (!_winapi.FindNextVolumeMountPoint(hPt, mountpoint, + if (!_winapi.FindNextVolumeMountPoint(hPt.get(), mountpoint, sizeof(mountpoint))) break; } - _winapi.FindVolumeMountPointClose(hPt); } }

6 years, 11 months

Windows agent: use RAII for service handles

by Jukka Aro

Module: check_mk Branch: master Commit: cbd8909d9718cf11d0ae4d98176a6836a59158dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbd8909d9718cf… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Dec 22 11:48:29 2017 +0100 Windows agent: use RAII for service handles Change-Id: I9785efeda92532e1ff3606e3a70fe9af75d37afa --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 27 ++++++++++--------------- agents/windows/sections/SectionServices.cc | 32 ++++++++++++++++-------------- agents/windows/types.h | 12 +++++++++++ 4 files changed, 41 insertions(+), 32 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 45a020f..4dd9c1b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3032 +3034 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index ca0498d..4977b5d 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -365,12 +365,11 @@ void InstallService() { sizeof(path) / sizeof(path[0])) > 0) { char quoted_path[1024]; snprintf(quoted_path, sizeof(quoted_path), "\"%s\"", path); - SC_HANDLE service = s_winapi.CreateService( + ServiceHandle service{s_winapi.CreateService( serviceControlManager, gszServiceName, gszServiceName, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, - SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, quoted_path); + SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, quoted_path), s_winapi}; if (service) { - s_winapi.CloseServiceHandle(service); printf(SERVICE_NAME " Installed Successfully\n"); } else { const DWORD lastError = s_winapi.GetLastError(); @@ -382,22 +381,20 @@ void InstallService() { static_cast<int>(lastError)); } } - - s_winapi.CloseServiceHandle(serviceControlManager); } } void UninstallService() { - SC_HANDLE serviceControlManager = - s_winapi.OpenSCManager(0, 0, SC_MANAGER_CONNECT); + ServiceHandle serviceControlManager{ + s_winapi.OpenSCManager(0, 0, SC_MANAGER_CONNECT), s_winapi}; if (serviceControlManager) { - SC_HANDLE service = - s_winapi.OpenService(serviceControlManager, gszServiceName, - SERVICE_QUERY_STATUS | DELETE); + ServiceHandle service{ + s_winapi.OpenService(serviceControlManager.get(), gszServiceName, + SERVICE_QUERY_STATUS | DELETE), s_winapi}; if (service) { SERVICE_STATUS serviceStatus; - if (s_winapi.QueryServiceStatus(service, &serviceStatus)) { + if (s_winapi.QueryServiceStatus(service.get(), &serviceStatus)) { while (in_set(serviceStatus.dwCurrentState, {SERVICE_RUNNING, SERVICE_STOP_PENDING})) { if (serviceStatus.dwCurrentState == SERVICE_STOP_PENDING) { @@ -407,12 +404,12 @@ void UninstallService() { waitTime = std::max(1000UL, std::min(waitTime, 10000UL)); s_winapi.Sleep(waitTime); - if (!s_winapi.QueryServiceStatus(service, + if (!s_winapi.QueryServiceStatus(service.get(), &serviceStatus)) { break; } } else { - if (s_winapi.ControlService(service, + if (s_winapi.ControlService(service.get(), SERVICE_CONTROL_STOP, &serviceStatus) == 0) { break; @@ -421,7 +418,7 @@ void UninstallService() { } if (serviceStatus.dwCurrentState == SERVICE_STOPPED) { - if (s_winapi.DeleteService(service)) + if (s_winapi.DeleteService(service.get())) printf(SERVICE_NAME " Removed Successfully\n"); else { const DWORD dwError = s_winapi.GetLastError(); @@ -441,9 +438,7 @@ void UninstallService() { printf(SERVICE_NAME " is still Running.\n"); } } - s_winapi.CloseServiceHandle(service); } - s_winapi.CloseServiceHandle(serviceControlManager); } } void do_install() { InstallService(); } diff --git a/agents/windows/sections/SectionServices.cc b/agents/windows/sections/SectionServices.cc index b9294fa..ff30ed2 100644 --- a/agents/windows/sections/SectionServices.cc +++ b/agents/windows/sections/SectionServices.cc @@ -27,6 +27,7 @@ typedef short SHORT; #include "Logger.h" #include "WinApiAdaptor.h" #include "stringutil.h" +#include "types.h" SectionServices::SectionServices(const Environment &env, Logger *logger, const WinApiAdaptor &winapi) @@ -38,13 +39,14 @@ const char *SectionServices::serviceStartType(SC_HANDLE scm, LPCWSTR service_name) { // Query the start type of the service const char *start_type = "invalid1"; - SC_HANDLE schService; LPQUERY_SERVICE_CONFIGW lpsc; - schService = _winapi.OpenServiceW(scm, service_name, SERVICE_QUERY_CONFIG); + ServiceHandle schService{ + _winapi.OpenServiceW(scm, service_name, SERVICE_QUERY_CONFIG), _winapi}; if (schService) { start_type = "invalid2"; DWORD dwBytesNeeded, cbBufSize; - if (!_winapi.QueryServiceConfig(schService, NULL, 0, &dwBytesNeeded)) { + if (!_winapi.QueryServiceConfig(schService.get(), NULL, 0, + &dwBytesNeeded)) { start_type = "invalid3"; DWORD dwError = _winapi.GetLastError(); if (dwError == ERROR_INSUFFICIENT_BUFFER) { @@ -52,8 +54,8 @@ const char *SectionServices::serviceStartType(SC_HANDLE scm, cbBufSize = dwBytesNeeded; lpsc = (LPQUERY_SERVICE_CONFIGW)_winapi.LocalAlloc(LMEM_FIXED, cbBufSize); - if (_winapi.QueryServiceConfig(schService, lpsc, cbBufSize, - &dwBytesNeeded)) { + if (_winapi.QueryServiceConfig(schService.get(), lpsc, + cbBufSize, &dwBytesNeeded)) { switch (lpsc->dwStartType) { case SERVICE_AUTO_START: start_type = "auto"; @@ -77,27 +79,28 @@ const char *SectionServices::serviceStartType(SC_HANDLE scm, _winapi.LocalFree(lpsc); } } - _winapi.CloseServiceHandle(schService); } return start_type; } bool SectionServices::produceOutputInner(std::ostream &out) { Debug(_logger) << "SectionServices::produceOutputInner"; - SC_HANDLE scm = _winapi.OpenSCManager( - 0, 0, SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE); - if (scm != INVALID_HANDLE_VALUE) { + ServiceHandle scm{ + _winapi.OpenSCManager( + 0, 0, SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE), + _winapi}; + if (scm) { DWORD bytes_needed = 0; DWORD num_services = 0; // first determine number of bytes needed - _winapi.EnumServicesStatusExW(scm, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, - SERVICE_STATE_ALL, NULL, 0, &bytes_needed, - &num_services, 0, 0); + _winapi.EnumServicesStatusExW(scm.get(), SC_ENUM_PROCESS_INFO, + SERVICE_WIN32, SERVICE_STATE_ALL, NULL, 0, + &bytes_needed, &num_services, 0, 0); if (_winapi.GetLastError() == ERROR_MORE_DATA && bytes_needed > 0) { BYTE *buffer = (BYTE *)malloc(bytes_needed); if (buffer) { if (_winapi.EnumServicesStatusExW( - scm, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, + scm.get(), SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, buffer, bytes_needed, &bytes_needed, &num_services, 0, 0)) { ENUM_SERVICE_STATUS_PROCESSW *service = @@ -131,7 +134,7 @@ bool SectionServices::produceOutputInner(std::ostream &out) { } const char *start_type = - serviceStartType(scm, service->lpServiceName); + serviceStartType(scm.get(), service->lpServiceName); // The service name usually does not contain spaces. But // in some cases it does. We replace them with _ in @@ -152,7 +155,6 @@ bool SectionServices::produceOutputInner(std::ostream &out) { free(buffer); } } - _winapi.CloseServiceHandle(scm); } return true; } diff --git a/agents/windows/types.h b/agents/windows/types.h index e6d5b0c..c4b20eb 100644 --- a/agents/windows/types.h +++ b/agents/windows/types.h @@ -470,4 +470,16 @@ struct HKeyHandleTraits { }; using HKeyHandle = WrappedHandle<HKeyHandleTraits>; + +struct ServiceHandleTraits { + using HandleT = SC_HANDLE; + static HandleT invalidValue() { return nullptr; } + + static void closeHandle(HandleT value, const WinApiAdaptor &winapi) { + winapi.CloseServiceHandle(value); + } +}; + +using ServiceHandle = WrappedHandle<ServiceHandleTraits>; + #endif // types_h

6 years, 11 months

checktestlib: Use types.NoneType for assertions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3a55abdf28d47ef3902b463038b45fe065b0e032 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a55abdf28d47e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 22 11:39:47 2017 +0100 checktestlib: Use types.NoneType for assertions Change-Id: Ifca027ede085b8b9dcb54c121c5ed743e229fea5 --- tests/checks/checktestlib.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 2d55171..492f10b 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -18,13 +18,13 @@ class PerfValue(object): assert type(value) in [int, float] self.value = value - assert type(warn) in [int, float, type(None)] + assert type(warn) in [int, float, types.NoneType] self.warn = warn - assert type(crit) in [int, float, type(None)] + assert type(crit) in [int, float, types.NoneType] self.crit = crit - assert type(minimum) in [int, float, type(None)] + assert type(minimum) in [int, float, types.NoneType] self.minimum = minimum - assert type(maximum) in [int, float, type(None)] + assert type(maximum) in [int, float, types.NoneType] self.maximum = maximum

6 years, 11 months

Windows agent: use RAII for registry handles

by Jukka Aro

Module: check_mk Branch: master Commit: 6469268e05e3c760e919396c1a1b2083d04e78d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6469268e05e3c7… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Dec 22 10:58:36 2017 +0100 Windows agent: use RAII for registry handles Change-Id: I1ca3488be31f6ce3279eb16f6b095bd96741186f --- agents/windows/Environment.cc | 7 +++---- agents/windows/EventLog.cc | 14 +++++++------- agents/windows/PerfCounter.cc | 3 ++- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 9 ++++----- agents/windows/test/EnvironmentTest.cc | 2 +- agents/windows/test/typesTest.cc | 18 ++++++++++++++++++ agents/windows/types.h | 10 ++++++++++ 8 files changed, 46 insertions(+), 19 deletions(-) diff --git a/agents/windows/Environment.cc b/agents/windows/Environment.cc index b9075b2..26d5a90 100644 --- a/agents/windows/Environment.cc +++ b/agents/windows/Environment.cc @@ -109,16 +109,15 @@ string Environment::determineAgentDirectory(bool use_cwd) const { &key); } - // TODO: wrap registry handling properly - OnScopeExit close_key([&]() { _winapi.RegCloseKey(key); }); + HKeyHandle hKey{key, _winapi}; if (ret == ERROR_SUCCESS) { vector<unsigned char> buffer(MAX_PATH_UNICODE, '\0'); DWORD dsize = MAX_PATH_UNICODE; if (ERROR_SUCCESS == - _winapi.RegQueryValueEx(key, "ImagePath", NULL, NULL, buffer.data(), - &dsize)) { + _winapi.RegQueryValueEx(hKey.get(), "ImagePath", NULL, NULL, + buffer.data(), &dsize)) { buffer.resize(dsize); string directory{buffer.begin(), buffer.end()}; // search backwards for backslash diff --git a/agents/windows/EventLog.cc b/agents/windows/EventLog.cc index b890d09..c2b1ac0 100644 --- a/agents/windows/EventLog.cc +++ b/agents/windows/EventLog.cc @@ -71,7 +71,7 @@ vector<wstring> MessageResolver::getMessageFiles(LPCWSTR source) const { wstring(L"SYSTEM\\CurrentControlSet\\Services\\EventLog"); wstring regpath = base + L"\\" + _name + L"\\" + source; - HKEY key; + HKEY key = nullptr; DWORD ret = _winapi.RegOpenKeyExW(HKEY_LOCAL_MACHINE, regpath.c_str(), 0, KEY_READ, &key); if (ret != ERROR_SUCCESS) { @@ -79,19 +79,19 @@ vector<wstring> MessageResolver::getMessageFiles(LPCWSTR source) const { return vector<wstring>(); } - // TODO: wrap registry handling properly - OnScopeExit close_key([&]() { _winapi.RegCloseKey(key); }); + HKeyHandle hKey{key, _winapi}; DWORD size = 64; vector<BYTE> buffer(size); // first try with fixed-size buffer - DWORD res = _winapi.RegQueryValueExW(key, L"EventMessageFile", nullptr, - nullptr, &buffer[0], &size); + DWORD res = + _winapi.RegQueryValueExW(hKey.get(), L"EventMessageFile", nullptr, + nullptr, buffer.data(), &size); if (res == ERROR_MORE_DATA) { buffer.resize(size); // actual read - res = _winapi.RegQueryValueExW(key, L"EventMessageFile", nullptr, - nullptr, &buffer[0], &size); + res = _winapi.RegQueryValueExW(hKey.get(), L"EventMessageFile", nullptr, + nullptr, buffer.data(), &size); } if (res != ERROR_SUCCESS) { Error(_logger) << "failed to read at EventMessageFile in HKLM:%ls : %s" diff --git a/agents/windows/PerfCounter.cc b/agents/windows/PerfCounter.cc index ed73071..185169d 100644 --- a/agents/windows/PerfCounter.cc +++ b/agents/windows/PerfCounter.cc @@ -9,6 +9,7 @@ #include "Logger.h" #include "PerfCounterCommon.h" #include "stringutil.h" +#include "types.h" #include "win_error.h" // Helper functions to navigate the performance counter data @@ -203,7 +204,7 @@ std::vector<BYTE> PerfCounterObject::retrieveCounterData( // to be closed manually, otherwise we may be blocking installation of apps // that create new performance counters. // say WHAT??? - _winapi.RegCloseKey(HKEY_PERFORMANCE_DATA); + HKeyHandle hKey{HKEY_PERFORMANCE_DATA, _winapi}; result.resize(buffer_size); return result; diff --git a/agents/windows/build_version b/agents/windows/build_version index e3c07a4..45a020f 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3030 +3032 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 89feb22..609994d 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -253,10 +253,10 @@ bool SectionEventlog::find_eventlogs(std::ostream &out) { char regpath[128]; snprintf(regpath, sizeof(regpath), "SYSTEM\\CurrentControlSet\\Services\\Eventlog"); - HKEY key; + HKEY key = nullptr; DWORD ret = _winapi.RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_ENUMERATE_SUB_KEYS, &key); - + HKeyHandle hKey{key, _winapi}; bool success = true; if (ret == ERROR_SUCCESS) { DWORD i = 0; @@ -264,8 +264,8 @@ bool SectionEventlog::find_eventlogs(std::ostream &out) { DWORD len; while (true) { len = sizeof(buffer); - DWORD r = _winapi.RegEnumKeyEx(key, i, buffer, &len, NULL, NULL, - NULL, NULL); + 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) { @@ -279,7 +279,6 @@ bool SectionEventlog::find_eventlogs(std::ostream &out) { } i++; } - _winapi.RegCloseKey(key); } else { success = false; const auto lastError = _winapi.GetLastError(); diff --git a/agents/windows/test/EnvironmentTest.cc b/agents/windows/test/EnvironmentTest.cc index 520ca2a..e82ef7a 100644 --- a/agents/windows/test/EnvironmentTest.cc +++ b/agents/windows/test/EnvironmentTest.cc @@ -30,7 +30,7 @@ TEST_F(wa_EnvironmentTest, constructor_CurrentDirectory) { TEST_F(wa_EnvironmentTest, constructor_AgentDirectory_use_cwd) { EXPECT_CALL(_mockwinapi, RegOpenKeyEx(_, _, _, _, _)).Times(0); EXPECT_CALL(_mockwinapi, RegQueryValueEx(_, _, _, _, _, _)).Times(0); - EXPECT_CALL(_mockwinapi, RegCloseKey(_)).Times(1); + EXPECT_CALL(_mockwinapi, RegCloseKey(_)).Times(0); const ::Environment testEnvironment(true, &_mocklogger, _mockwinapi); EXPECT_EQ(testEnvironment.currentDirectory(), testEnvironment.agentDirectory()); diff --git a/agents/windows/test/typesTest.cc b/agents/windows/test/typesTest.cc index c729257..aa6eccd 100644 --- a/agents/windows/test/typesTest.cc +++ b/agents/windows/test/typesTest.cc @@ -307,3 +307,21 @@ TEST_F(wa_WrappedHandleTest, NullHandleTraits_valid_handle) { ASSERT_EQ(rawHandle, testHandle.get()); } } + +class wa_HKeyHandleTest : public wa_typesTest {}; + +TEST_F(wa_HKeyHandleTest, valid_key) { + HKEY rawKey = reinterpret_cast<HKEY>(0x1); + const char *testPath = "foo\\bar"; + EXPECT_CALL(_mockwinapi, RegOpenKeyEx(HKEY_LOCAL_MACHINE, testPath, 0, + KEY_ENUMERATE_SUB_KEYS, _)) + .WillOnce(DoAll(SetArgPointee<4>(rawKey), Return(ERROR_SUCCESS))); + EXPECT_CALL(_mockwinapi, RegCloseKey(rawKey)); + { + HKEY key = nullptr; + auto result = _mockwinapi.RegOpenKeyEx(HKEY_LOCAL_MACHINE, testPath, 0, + KEY_ENUMERATE_SUB_KEYS, &key); + ASSERT_EQ(ERROR_SUCCESS, result); + HKeyHandle testKey{key, _mockwinapi}; + } +} diff --git a/agents/windows/types.h b/agents/windows/types.h index 29f1540..e6d5b0c 100644 --- a/agents/windows/types.h +++ b/agents/windows/types.h @@ -460,4 +460,14 @@ using HModuleHandle = WrappedHandle<HModuleTraits>; template <int exitCode> using JobHandle = WrappedHandle<JobHandleTraits<exitCode>>; +struct HKeyHandleTraits { + using HandleT = HKEY; + static HandleT invalidValue() { return nullptr; } + + static void closeHandle(HandleT value, const WinApiAdaptor &winapi) { + winapi.RegCloseKey(value); + } +}; + +using HKeyHandle = WrappedHandle<HKeyHandleTraits>; #endif // types_h

6 years, 11 months

Reformat docstrings

by Konstantin Büttner

Module: check_mk Branch: master Commit: 94a2f52ca62d78d870e88249606a3fe30064e0ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94a2f52ca62d78… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 22 10:16:49 2017 +0100 Reformat docstrings Change-Id: I115dcd452e6b810a2a3e27b47ec149b99d8d9c61 --- tests/checks/checktestlib.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index c8a723d..2d55171 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -29,10 +29,12 @@ class PerfValue(object): class BasicCheckResult(object): - """A basic check result + """ + A basic check result This class models a basic check result (status, infotext, perfdata) and provides - facilities to match it against conditions, such as 'Status is...' or 'Infotext contains...' + facilities to match it against conditions, such as 'Status is...' or + 'Infotext contains...' """ def __init__(self, status, infotext, perfdata=None): @@ -55,13 +57,17 @@ class BasicCheckResult(object): class CheckResult(object): - """A check result potentially consisting of multiple subresults, as returned by yield-style checks""" + """ + A check result potentially consisting of multiple subresults, + as returned by yield-style checks + """ def __init__(self, result): - """Initializes a list of subresults using BasicCheckResult. + """ + Initializes a list of subresults using BasicCheckResult. - If the result is already a plain check result in its tuple representation, we initialize - a list of length 1. + If the result is already a plain check result in its tuple representation, + we initialize a list of length 1. """ if type(result) == types.GeneratorType:

6 years, 11 months

Fix typo in comments

by Jukka Aro

Module: check_mk Branch: master Commit: cd7c7ab514339e760577fe11b4399ca870dc2465 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd7c7ab514339e… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Dec 22 08:07:55 2017 +0100 Fix typo in comments Change-Id: I66b6d375345a96b6489150b9a0c765945272d1f9 --- agents/windows/it/remote.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/it/remote.py b/agents/windows/it/remote.py index b9e7de2..6352078 100644 --- a/agents/windows/it/remote.py +++ b/agents/windows/it/remote.py @@ -8,9 +8,9 @@ import subprocess import sys import telnetlib -# To use a another host for running the tests, replace this IP address. +# To use another host for running the tests, replace this IP address. remote_ip = '10.1.2.30' -# To use a another user account for running the tests, replace this username. +# To use another user account for running the tests, replace this username. remoteuser = 'NetworkAdministrator' remotedir = os.path.join(os.sep, 'Users', remoteuser, 'Tests') sshopts = "-o StrictHostKeyChecking=no"

6 years, 11 months

5485 FIX alcatel_power: improved detection of power supplies on newer devices

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 2d62242e4c6f4d03972b34ec4193b5d7f711e186 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d62242e4c6f4d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Dec 21 16:24:49 2017 +0100 5485 FIX alcatel_power: improved detection of power supplies on newer devices Previously, the power supplies were detected based on the module type id. Now the power supplies are detected through the more specifig power supply type. The module type is only used as a fallback when the power supply type is not available. Change-Id: I75734bac103180ab264e91a0e65def17f85d4b66 --- .werks/5485 | 13 +++++++++++++ checks/alcatel_power | 21 +++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.werks/5485 b/.werks/5485 new file mode 100644 index 0000000..dc51167 --- /dev/null +++ b/.werks/5485 @@ -0,0 +1,13 @@ +Title: alcatel_power: improved detection of power supplies on newer devices +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1513869431 +Class: fix + +Previously, the power supplies were detected based on the module type id. +Now the power supplies are detected through the more specifig power supply +type. The module type is only used as a fallback when the power supply +type is not available. diff --git a/checks/alcatel_power b/checks/alcatel_power index 3bd7d39..486e26f 100644 --- a/checks/alcatel_power +++ b/checks/alcatel_power @@ -26,16 +26,20 @@ def inventory_alcatel_power(info): for line in info: - if line[2] in ['0x35000001', '0x45000002', '0x45000004', '0x45000008', '0x45000009']: - yield line[0], None + oid_end, _, device_type, power_type = line + if (power_type and power_type != '0' or + device_type in ['0x35000001', '0x45000002', '0x45000004', '0x45000008', '0x45000009']): + yield oid_end, None def check_alcatel_power(item, _no_params, info): for line in info: - if item == line[0]: - if line[2] not in ['0x35000001', '0x45000004', '0x45000002', '0x45000008', '0x45000009']: + oid_end, status, device_type, power_type = line + if item == oid_end: + if (power_type and power_type == '0' or + device_type not in ['0x35000001', '0x45000004', '0x45000002', '0x45000008', '0x45000009']): return 3, "No Power supply connected to this port" - if int(line[1]) != 1: - return 2, "Supply in error condition (%s)" % line[1] + if status != '1': + return 2, "Supply in error condition (%s)" % status return 0, "Supply status OK" return 3, "Supply not found" @@ -46,8 +50,9 @@ check_info["alcatel_power"] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.6486.800"), "snmp_info" : (".1.3.6.1.4.1.6486.800.1.1.1.1.1.1.1", [OID_END, - 2, # Error Status - 5 # Device Type (0x35000001 == Power Supply) + 2, # Error Status + 5, # Device Type (0x35000001 == Power Supply) + 36, # chasEntPhysPowerType: 0 no power supply, 1 ac, 2 dc (not available on old devices) ]), }

6 years, 11 months

5484 FIX logwatch.ec: Fix exception when reclassify patterns are specified

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 810e9ec0995de261a2e1d39cdcd32bb153f483b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=810e9ec0995de2… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Dec 20 15:24:41 2017 +0100 5484 FIX logwatch.ec: Fix exception when reclassify patterns are specified Change-Id: Id6a2cc807e6041b2f8af7047fd6bb7ad3bed9054 --- .werks/5484 | 11 +++++++++++ checks/logwatch | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5484 b/.werks/5484 new file mode 100644 index 0000000..d6dc1d4 --- /dev/null +++ b/.werks/5484 @@ -0,0 +1,11 @@ +Title: logwatch.ec: Fix exception when reclassify patterns are specified +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1513779501 + + diff --git a/checks/logwatch b/checks/logwatch index 93c485b..088b324 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -848,11 +848,11 @@ def check_logwatch_ec(item, params, info): logfile_reclassify_settings = {} def add_reclassify_settings(settings): if isinstance(settings, dict): - logfile_reclassify_settings["reclassify_patterns"].extend(x[:2] for x in settings.get("reclassify_patterns")) + logfile_reclassify_settings["reclassify_patterns"].extend(x for x in settings.get("reclassify_patterns")) if "reclassify_states" in settings: logfile_reclassify_settings["reclassify_states"] = settings["reclassify_states"] else: # legacy configuration - logfile_reclassify_settings["reclassify_patterns"].extend(x[:2] for x in settings) + logfile_reclassify_settings["reclassify_patterns"].extend(x for x in settings) for logfile, lines in logs.items(): logfile_reclassify_settings["reclassify_patterns"] = []

6 years, 11 months

Windows agent: add integration tests

by Jukka Aro

Module: check_mk Branch: master Commit: 0b32949f1c12412ce2f8f28e0f24f1dfe639d9c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b32949f1c1241… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Oct 20 12:16:54 2017 +0200 Windows agent: add integration tests Add pytest-based integration tests. The purpose is to offer basic regression tests to ensure that basic functionality remains intact across refactorings etc. The test setup requires a local Linux machine to run the tests on. The user at the Linux machine must have ssh RSA key pair specifically generated for this purpose as ~/.ssh/id_rsa_windows_test[.pub]. A dedicated Windows server must be available for remote access over SSH with the public key in its authorized keys. Each pytest test case will be initiated on local Linux machine but switch over SSH to the remote Windows server and run the actual test case there. Per-session setup and teardown, e.g. copying files over SSH is done with the help of per-session pytest fixtures defined in conftest.py. The tests cover most of the sections in the output of the Windows agent. Currently excluded are the sections MS Exchange and Skype as these require the installations of these commercial software products. The output is verified against expected patterns and is likely to find the vast majority of missing or malformatted output. Substantial errors resulting from broken functionality but that are formatted and output correctly are likely to go unnoticed. The sections 'plugins' and 'local' are tested with the plugins netstat_an.bat and wmic_if.bat. The target is to ensure the correct functionality of the plugin execution framework of the Windows agent. The tests can be later extended to test the execution of other plugins, if necessary. Besides the output of agent sections during normal execution, the start parameters of the Windows agent are tested. These tests would interfere with possibly existing Check_MK_Agent service on the system. This is why a possibly existing installation is removed during test setup. Inter-process synchronized access to lock file is used in order to prevent simultaneous execution of tests in several processes. PENDING CHANGES: The build target integrationtest will be committed separately later when the build server(s) support the test-specific SSH keys. Before that, a premature commit of the build changes would break the build. Change-Id: I26e5543924e07acff56be16f9fe6724a8f78358a --- agents/windows/it/conftest.py | 77 +++++++ agents/windows/it/lock.py | 50 +++++ agents/windows/it/remote.py | 186 ++++++++++++++++ agents/windows/it/test_agent_start_parameters.py | 242 +++++++++++++++++++++ agents/windows/it/test_section_check_mk.py | 120 ++++++++++ agents/windows/it/test_section_df.py | 32 +++ agents/windows/it/test_section_dotnet_clrmemory.py | 44 ++++ agents/windows/it/test_section_eventlog.py | 194 +++++++++++++++++ agents/windows/it/test_section_fileinfo.py | 76 +++++++ agents/windows/it/test_section_logfiles.py | 202 +++++++++++++++++ agents/windows/it/test_section_mem.py | 35 +++ agents/windows/it/test_section_mrpe.py | 64 ++++++ .../windows/it/test_section_openhardwaremonitor.py | 95 ++++++++ agents/windows/it/test_section_plugin_group.py | 120 ++++++++++ agents/windows/it/test_section_ps.py | 42 ++++ agents/windows/it/test_section_services.py | 33 +++ agents/windows/it/test_section_spool.py | 61 ++++++ agents/windows/it/test_section_systemtime.py | 26 +++ agents/windows/it/test_section_uptime.py | 25 +++ agents/windows/it/test_section_winperf.py | 31 +++ agents/windows/it/test_section_wmi_cpuload.py | 64 ++++++ agents/windows/it/test_section_wmi_webservices.py | 83 +++++++ 22 files changed, 1902 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0b32949f1c…

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017