Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1a8d1b91ba166e84ccf6a15120e106fe277d66fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a8d1b91ba166e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Mar 22 14:59:09 2019 +0100 YAPF wato/mkeventd.py Change-Id: Ifd9ab9d684e5cb14861bd03acfda4b7e66c412e8 --- cmk/gui/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/wato/mkeventd.py b/cmk/gui/wato/mkeventd.py index 8cf93bb..b977d94 100644 --- a/cmk/gui/wato/mkeventd.py +++ b/cmk/gui/wato/mkeventd.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ |

5 years, 3 months

Event console: Improve help text for host and service contact rulesets

by Konstantin Büttner

Module: check_mk Branch: master Commit: e087f45a41283faa0f0568e3bfef6c725e93dd44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e087f45a41283f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Mar 22 14:36:37 2019 +0100 Event console: Improve help text for host and service contact rulesets Change-Id: If9fe71e33547f8fc94e3283ee2f126fc1b1806b7 --- cmk/gui/wato/mkeventd.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmk/gui/wato/mkeventd.py b/cmk/gui/wato/mkeventd.py index b977d94..3a93ec0 100644 --- a/cmk/gui/wato/mkeventd.py +++ b/cmk/gui/wato/mkeventd.py @@ -3950,9 +3950,10 @@ def _vs_contact(title): title=title, help=_("This rule set is useful if you send your monitoring notifications " "into the Event Console. The contact information that is set by this rule " - "will be put into the resulting event in the Event Console.") + _( - " Note: if no contact information is configured for a service " - "then that of the host will be used instead (if configured)."), + "will be put into the resulting event in the Event Console. " + "This does not transport contact objects or contact groups, but is a free " + "comment field.") + _(" Note: if no contact information is configured for a service " + "then that of the host will be used instead (if configured)."), size=80, regex=r"^[^;'$|]*$", regex_error=_("The contact information must not contain one of the characters "

5 years, 3 months

[CMK-1791] - memory leak in WMI fixed twice

by Sergey Kipnis

Module: check_mk Branch: master Commit: c0338ff8fe3a9138924ef1ad446637e5857f851b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0338ff8fe3a91… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri Mar 22 13:37:22 2019 +0100 [CMK-1791] - memory leak in WMI fixed twice - forgotten RAII introduced for WmiWrapper - management of raw Windows handles are still based on the ON_OUT_OF_SCOPE. To be refactored in the future Change-Id: I4110bbec42dea10ecce4bdc842803021ad6c35f6 --- agents/wnx/src/common/wtools.cpp | 19 ++++++++++++++++--- agents/wnx/src/common/wtools.h | 9 +++++++++ agents/wnx/src/engine/providers/ps.cpp | 1 + 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/agents/wnx/src/common/wtools.cpp b/agents/wnx/src/common/wtools.cpp index c31ce50..48b6015 100644 --- a/agents/wnx/src/common/wtools.cpp +++ b/agents/wnx/src/common/wtools.cpp @@ -1147,6 +1147,20 @@ bool WmiWrapper::open() noexcept { // Obtain the initial locator to Windows return true; } +// clean all +void WmiWrapper::close() noexcept { + std::lock_guard lk(lock_); + if (locator_) { + locator_->Release(); + locator_ = nullptr; + } + + if (services_) { + services_->Release(); + services_ = nullptr; + } +} + // connect to the WMI namespace, root\\Something // returns true when connect succeed or connect exists // thread safe @@ -1216,6 +1230,7 @@ bool WmiWrapper::impersonate() noexcept { } // tested implicitly +// RETURNS RAW OBJECT // returns nullptr on any error IWbemClassObject* WmiGetNextObject(IEnumWbemClassObject* Enumerator) { if (!Enumerator) { @@ -1258,6 +1273,7 @@ std::wstring WmiWrapper::produceTable( while (Enumerator) { wmi_object = WmiGetNextObject(Enumerator); if (!wmi_object) break; + ON_OUT_OF_SCOPE(wmi_object->Release()); // names if (print_names_please) { @@ -1276,9 +1292,6 @@ std::wstring WmiWrapper::produceTable( auto raw = wtools::WmiStringFromObject(wmi_object, names); if (!raw.empty()) result += raw + L"\n"; - - wmi_object->Release(); - wmi_object = nullptr; } return result; } diff --git a/agents/wnx/src/common/wtools.h b/agents/wnx/src/common/wtools.h index be983e6..d7e703a 100644 --- a/agents/wnx/src/common/wtools.h +++ b/agents/wnx/src/common/wtools.h @@ -888,6 +888,14 @@ IWbemClassObject* WmiGetNextObject(IEnumWbemClassObject* Enumerator); // the class is thread safe(theoretisch) class WmiWrapper { public: + WmiWrapper() : locator_(nullptr), services_(nullptr) {} + + WmiWrapper(const WmiWrapper&) = delete; + WmiWrapper& operator=(const WmiWrapper&) = delete; + WmiWrapper(WmiWrapper&&) = delete; + WmiWrapper& operator=(WmiWrapper&&) = delete; + + virtual ~WmiWrapper() { close(); } // first call bool open() noexcept; @@ -912,6 +920,7 @@ public: const std::wstring& Target) noexcept; private: + void close() noexcept; // build valid WQL query static std::wstring makeQuery(const std::vector<std::wstring> Names, const std::wstring& Target) noexcept; diff --git a/agents/wnx/src/engine/providers/ps.cpp b/agents/wnx/src/engine/providers/ps.cpp index f04dc0a..c3f061a 100644 --- a/agents/wnx/src/engine/providers/ps.cpp +++ b/agents/wnx/src/engine/providers/ps.cpp @@ -271,6 +271,7 @@ std::string ProducePsWmi(bool FullPath) { while (1) { auto object = wtools::WmiGetNextObject(processes); if (!object) break; + ON_OUT_OF_SCOPE(object->Release()); auto process_id = GetUint32AsInt64(object, L"ProcessId");

5 years, 3 months

[CMK-1791] - fixed names of msexch registry entries.

by Sergey Kipnis

Module: check_mk Branch: master Commit: a59a8453812ebd2593739336a2c87fd221a9f197 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a59a8453812ebd… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri Mar 22 13:51:19 2019 +0100 [CMK-1791] - fixed names of msexch registry entries. - impossible to test without MS Exchange Server Change-Id: Ie5d60bb53bd27b7be9a1eb84d296a5fb543e2827 --- agents/wnx/src/engine/providers/wmi.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/agents/wnx/src/engine/providers/wmi.cpp b/agents/wnx/src/engine/providers/wmi.cpp index 22ffbe5..559fb63 100644 --- a/agents/wnx/src/engine/providers/wmi.cpp +++ b/agents/wnx/src/engine/providers/wmi.cpp @@ -65,30 +65,30 @@ NamedWmiSources G_SectionObjects = { {"msexch_activesync", {kWmiPathStd, - L"Win32_PerfRawDara_MSExchangeActiveSync_MSExchangeActiveSync"}}, + L"Win32_PerfRawData_MSExchangeActiveSync_MSExchangeActiveSync"}}, // MSEXCHANGE group {"msexch_availability", {kWmiPathStd, - L"Win32_PerfRawDara_MSExchangeAvailabilityService_MSExchangeAvailabilityService"}}, + L"Win32_PerfRawData_MSExchangeAvailabilityService_MSExchangeAvailabilityService"}}, {"msexch_owa", // - {kWmiPathStd, L"Win32_PerfRawDara_MSExchangeOWA_MSExchangeOWA"}}, + {kWmiPathStd, L"Win32_PerfRawData_MSExchangeOWA_MSExchangeOWA"}}, {"msexch_autodiscovery", {kWmiPathStd, - L"Win32_PerfRawDara_MSExchangeAutodiscover_MSExchangeAutodiscover"}}, + L"Win32_PerfRawData_MSExchangeAutodiscover_MSExchangeAutodiscover"}}, {"msexch_isclienttype", {kWmiPathStd, - L"Win32_PerfRawDara_MSExchangeISClientType_MSExchangeISClientType"}}, + L"Win32_PerfRawData_MSExchangeISClientType_MSExchangeISClientType"}}, {"msexch_isstore", - {kWmiPathStd, L"Win32_PerfRawDara_MSExchangeISStore_MSExchangeISStore"}}, + {kWmiPathStd, L"Win32_PerfRawData_MSExchangeISStore_MSExchangeISStore"}}, {"msexch_rpcclientaccess", {kWmiPathStd, - L"Win32_PerfRawDara_MSExchangeRpcClientAccess_MSExchangeRpcClientAccess"}} + L"Win32_PerfRawData_MSExchangeRpcClientAccess_MSExchangeRpcClientAccess"}} // end };

5 years, 3 months

[CMK-1807] - self testing call "-test self"

by Sergey Kipnis

Module: check_mk Branch: master Commit: 75b9ac47a1d21464c958bfec9b535722e15bf4dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75b9ac47a1d214… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri Mar 22 13:30:59 2019 +0100 [CMK-1807] - self testing call "-test self" - allows every 25 second call of the agent with results on - diagnostic is imporved Change-Id: Iee8241ebff6d804e492aab3c518806caeaf4ebd4 --- agents/wnx/src/engine/external_port.h | 13 +++- agents/wnx/src/engine/providers/plugins.cpp | 4 +- agents/wnx/src/engine/service_processor.h | 6 +- agents/wnx/src/engine/windows_service_api.cpp | 90 +++++++++++++++++++++++++-- 4 files changed, 102 insertions(+), 11 deletions(-) diff --git a/agents/wnx/src/engine/external_port.h b/agents/wnx/src/engine/external_port.h index e0078c4..a8a56eb 100644 --- a/agents/wnx/src/engine/external_port.h +++ b/agents/wnx/src/engine/external_port.h @@ -208,9 +208,18 @@ private: // #TODO blocking call here. This is not a good idea x->start(Reply); + } catch (const std::system_error& e) { + if (e.code().value() == WSAECONNRESET) + XLOG::l.i(XLOG_FLINE + " Client closed connection"); + else + XLOG::l( + XLOG_FLINE + + " Thrown unexpected exception '{}' with value {}", + e.what(), e.code().value()); } catch (const std::exception& e) { - XLOG::l(XLOG_FLINE + " Thrown unexpected exception {}", - e.what()); + XLOG::l( + XLOG_FLINE + " Thrown unexpected exception '{}'", + e.what()); } } diff --git a/agents/wnx/src/engine/providers/plugins.cpp b/agents/wnx/src/engine/providers/plugins.cpp index 69d1d30..332c5aa 100644 --- a/agents/wnx/src/engine/providers/plugins.cpp +++ b/agents/wnx/src/engine/providers/plugins.cpp @@ -88,7 +88,7 @@ void PluginsProvider::gatherAllData(std::string& Out) { // empty body empty void PluginsProvider::updateSectionStatus() { - XLOG::d(XLOG_FUNC + " !"); + XLOG::d.t(XLOG_FUNC + " !"); std::string out = cma::section::MakeEmptyHeader(); gatherAllData(out); out += cma::section::MakeEmptyHeader(); @@ -97,7 +97,7 @@ void PluginsProvider::updateSectionStatus() { // local body empty void LocalProvider::updateSectionStatus() { - XLOG::d(XLOG_FUNC + " !"); + XLOG::d.t(XLOG_FUNC + " !"); std::string out = cma::section::MakeLocalHeader(); gatherAllData(out); out += cma::section::MakeEmptyHeader(); diff --git a/agents/wnx/src/engine/service_processor.h b/agents/wnx/src/engine/service_processor.h index 907f5b7..bd95240 100644 --- a/agents/wnx/src/engine/service_processor.h +++ b/agents/wnx/src/engine/service_processor.h @@ -556,9 +556,9 @@ private: [this, ExeName](const AnswerId Tp, ServiceProcessor* Proc, const std::wstring& SegmentName, int Timeout, const std::wstring& CommandLine) { - XLOG::l("Exec {} for {} started", - wtools::ConvertToUTF8(ExeName), - wtools::ConvertToUTF8(SegmentName)); + XLOG::l.i("Exec {} for {} started", + wtools::ConvertToUTF8(ExeName), + wtools::ConvertToUTF8(SegmentName)); auto full_path = cma::cfg::FindExeFileOnPath(ExeName); if (full_path.empty()) { diff --git a/agents/wnx/src/engine/windows_service_api.cpp b/agents/wnx/src/engine/windows_service_api.cpp index c90e4c2..90d45f3 100644 --- a/agents/wnx/src/engine/windows_service_api.cpp +++ b/agents/wnx/src/engine/windows_service_api.cpp @@ -150,6 +150,81 @@ static void CheckForCommand(std::string& Command) { return; } +// on -test self +int TestMainServiceSelf() { + XLOG::setup::DuplicateOnStdio(true); + XLOG::setup::ColoredOutputOnStdio(true); + bool stop = false; + + // not a best method to call thread, but this is only for VISUAL testing + std::thread kick_and_print([&stop]() { + auto port = cma::cfg::groups::global.port(); + + using namespace asio; + + io_context ios; + std::string address = "127.0.0.1"; + + ip::tcp::endpoint endpoint(ip::make_address(address), port); + + asio::ip::tcp::socket socket(ios); + std::error_code ec; + + while (!stop) { + auto enc = cma::cfg::groups::global.globalEncrypt(); + auto password = enc ? cma::cfg::groups::global.password() : ""; + socket.connect(endpoint, ec); + if (ec.value() != 0) { + XLOG::l("Can't connect to {}:{}, waiting for 5 seconds", + address, port); + + // methods below is not a good still we do not want + // to over complicate the code just for testing purposes + for (int i = 0; i < 5; i++) { + if (stop) break; + cma::tools::sleep(1000); + } + if (stop) break; + continue; + } + error_code error; + std::vector<char> v; + for (;;) { + char text[4096]; + auto count = socket.read_some(asio::buffer(text), error); + if (error.value()) break; + if (count) { + v.insert(v.end(), text, text + count); + } + } + XLOG::l.i("Received {} bytes", v.size()); + if (enc && password[0]) { + XLOG::l.i("Decrypting {} bytes", v.size()); + // attempt to decode + cma::encrypt::Commander e(password); + auto size = v.size(); + v.resize(size + 1024); + auto [ret, sz] = e.decode(v.data(), size, true); + XLOG::l.i("Decrypted {} bytes {}", ret, sz); + } + socket.close(); + // methods below is not a good still we do not want + // to over complicate the code just for testing purposes + for (int i = 0; i < 25; i++) { + if (stop) break; + cma::tools::sleep(1000); + } + } + XLOG::l.i("Leaving testing thread"); + }); + + ExecMainService(); // blocking call waiting for keypress + stop = true; + if (kick_and_print.joinable()) kick_and_print.join(); + + return 0; +} + // on -test int TestMainService(const std::wstring& What) { using namespace std::chrono; @@ -195,10 +270,17 @@ int TestMainService(const std::wstring& What) { 2000ms, [&command](const void* Sp) { return true; }); sp.startServiceAsLegacyTest(); sp.stopService(); + } else if (What == L"self") { + TestMainServiceSelf(); + } else { + XLOG::setup::DuplicateOnStdio(true); + XLOG::setup::ColoredOutputOnStdio(true); + XLOG::l( + "Unsupported second parameter\n\tAllowed: port, mt, legacy, self"); } return 0; -} +} // namespace srv // on -cvt // may be used as internal API function to convert ini to yaml @@ -408,8 +490,9 @@ int ServiceAsService( auto processor = new ServiceProcessor(Delay, InternalCallback); wtools::ServiceController service_controller(processor); auto ret = service_controller.registerAndRun( - cma::srv::kServiceName); // we will stay here till service will - // be stopped itself or from outside + cma::srv::kServiceName); // we will stay here till + // service will be stopped + // itself or from outside return ret ? 0 : -1; } catch (const std::exception& e) { XLOG::l.crit("Exception hit {} in main proc", e.what()); @@ -421,5 +504,4 @@ int ServiceAsService( } } // namespace srv - }; // namespace cma

5 years, 3 months

6969 FIX Fixed recurring flexible downtimes.

by Sven Panne

Module: check_mk Branch: master Commit: f7b6dcdd5dd3622bae05c7b7698772de5c53e165 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7b6dcdd5dd362… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 22 12:05:21 2019 +0100 6969 FIX Fixed recurring flexible downtimes. Previously, the combination of "recurring" and "flexible" was broken for downtimes. The effect was that such downtimes remained hot even outside their intended time window, so that the next occurring problem just triggered the start of such a downtime and no problem was notified. An example for such a scenario: A flexible host downtime was configured to happen every day between 02:00 and 03:00 for 2 hours. Everything was OK between 02:00 and 03:00, but at 08:15 the host went DOWN. This started the downtime, lasting until 10:15, which is of course totally unintended: The problem did not happen between 02:00-03:00, so the downtime should not start and normal problem processing should be done, including notifications etc. This has been fixed, so the recurring flexible downtimes are working as intended now. If you update your installation, there is nothing more you have to do, all downtimes automatically work correctly after that. If you do not want to update yet, you should delete your recurring flexible downtimes for now and add new recurring fixed downtimes instead as a workaround until you update. Change-Id: I16a10a53882d5e9f4fec71ba8af3d5956742c819 --- .werks/6969 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.werks/6969 b/.werks/6969 new file mode 100644 index 0000000..c063aac --- /dev/null +++ b/.werks/6969 @@ -0,0 +1,27 @@ +Title: Fixed recurring flexible downtimes. +Level: 2 +Component: cmc +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1553251801 +Class: fix + +Previously, the combination of "recurring" and "flexible" was broken for +downtimes. The effect was that such downtimes remained hot even outside +their intended time window, so that the next occurring problem just +triggered the start of such a downtime and no problem was notified. + +An example for such a scenario: A flexible host downtime was configured to +happen every day between 02:00 and 03:00 for 2 hours. Everything was OK +between 02:00 and 03:00, but at 08:15 the host went DOWN. This started the +downtime, lasting until 10:15, which is of course totally unintended: The +problem did not happen between 02:00-03:00, so the downtime should not start +and normal problem processing should be done, including notifications etc. + +This has been fixed, so the recurring flexible downtimes are working as +intended now. If you update your installation, there is nothing more you +have to do, all downtimes automatically work correctly after that. If you +do not want to update yet, you should delete your recurring flexible +downtimes for now and add new recurring fixed downtimes instead as a +workaround until you update.

5 years, 3 months

7069 FIX agent_kubernetes: the kilo suffix for resources may be lowercase

by Tom Baerwinkel

Module: check_mk Branch: master Commit: d587d4b1a837d30a4983ab68dbba4efa41f76a67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d587d4b1a837d3… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 22 11:20:08 2019 +0100 7069 FIX agent_kubernetes: the kilo suffix for resources may be lowercase Resolve an issue where parsing of memory failed if the suffix for memory resources was 'k' instead of 'K'. Change-Id: Ib63c6472b22c828ecf3888bbbfc6636ebeff13e9 --- .werks/7069 | 12 ++++++++++++ cmk/special_agents/agent_kubernetes.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/7069 b/.werks/7069 new file mode 100644 index 0000000..13d7c2a --- /dev/null +++ b/.werks/7069 @@ -0,0 +1,12 @@ +Title: agent_kubernetes: the kilo suffix for resources may be lowercase +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1553249538 + +Resolve an issue where parsing of memory failed if the suffix for +memory resources was 'k' instead of 'K'. diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index f5c6293..f6b6bbe 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -131,7 +131,7 @@ def parse_memory(value): if value.endswith('Ei'): return 1024**6 * float(value[:-2]) - if value.endswith('K'): + if value.endswith('K') or value.endswith('k'): return 1e3 * float(value[:-1]) if value.endswith('M'): return 1e6 * float(value[:-1])

5 years, 3 months

Fixed formatting

by Lars Michelsen

Module: check_mk Branch: master Commit: 94b0f206829a7e1916fd89aa54eaa0693c13d695 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94b0f206829a7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 22 11:03:14 2019 +0100 Fixed formatting Change-Id: I6d30a7ab21326407c3fe2ea5ccb4bcb1ff3da0c8 --- cmk/gui/watolib/activate_changes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk/gui/watolib/activate_changes.py b/cmk/gui/watolib/activate_changes.py index 4bf9b38..8d7544d 100644 --- a/cmk/gui/watolib/activate_changes.py +++ b/cmk/gui/watolib/activate_changes.py @@ -1158,7 +1158,6 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): self._expected_duration = duration - def execute_activate_changes(domains): domains = set(domains).union(ConfigDomain.get_always_activate_domain_idents())

5 years, 3 months

7068 FIX Truncate values of the notification context which are too long

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 36c1927d2a1e2c8365f9eedae502ea3c0445f15e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36c1927d2a1e2c… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Mar 21 16:14:09 2019 +0100 7068 FIX Truncate values of the notification context which are too long If the the value stored in the notification context was larger than the OS limit MAX_ARG_STRLEN a failed notification was produced and the error 'OSError: [Errno 7] Argument list too long' appeared in the notify.log. This was usually the case for very long values in the long outputs of a service like e.g. fileinfo.groups. Now the values are truncated and the text 'Attention: Removed remaining content because it was too long.' is shown at the end. Change-Id: I726dc536378f54da5dccf624d551b1565ecf0d47 --- .werks/7068 | 16 ++++++++++++++++ cmk_base/notify.py | 35 +++++++++++++++++++++-------------- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/.werks/7068 b/.werks/7068 new file mode 100644 index 0000000..3bfc58b --- /dev/null +++ b/.werks/7068 @@ -0,0 +1,16 @@ +Title: Truncate values of the notification context which are too long +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1553180240 +Class: fix + +If the the value stored in the notification context was larger than +the OS limit MAX_ARG_STRLEN a failed notification was produced and +the error 'OSError: [Errno 7] Argument list too long' appeared in +the notify.log. This was usually the case for very long values in +the long outputs of a service like e.g. fileinfo.groups. Now the +values are truncated and the text 'Attention: Removed remaining +content because it was too long.' is shown at the end. diff --git a/cmk_base/notify.py b/cmk_base/notify.py index f669089..94f90ea 100755 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -1310,18 +1310,6 @@ def path_to_notification_script(plugin): # # Note: this function is *not* being called for bulk notification. def call_notification_script(plugin, plugin_context): - # FIXME: This is a temporary workaround to avoid a possible crash of - # subprocess.Popen when a crash dump occurs. Since in this case the - # LONGSERVICEOUTPUT and LONGSERVICEOUTPUT_HTML contain very long base64 - # encoded strings an 'OSError: [Errno 7] Argument list too long' may - # occur. To avoid this we replace the base64 encoded strings here. - if plugin_context.get('LONGSERVICEOUTPUT', '').startswith('Crash dump:\\n'): - plugin_context[ - 'LONGSERVICEOUTPUT'] = u'Check failed:\\nA crash report can be submitted via the user interface.' - if plugin_context.get('LONGSERVICEOUTPUT_HTML', '').startswith('Crash dump:\\n'): - plugin_context[ - 'LONGSERVICEOUTPUT_HTML'] = u'Check failed:\\nA crash report can be submitted via the user interface.' - core_notification_log(plugin, plugin_context) def plugin_log(s): @@ -1374,8 +1362,27 @@ def call_notification_script(plugin, plugin_context): # Construct the environment for the notification script def notification_script_env(plugin_context): - return dict(os.environ.items() + - [("NOTIFY_" + k, v.encode("utf-8")) for k, v in plugin_context.items()]) + # Use half of the maximum allowed string length MAX_ARG_STRLEN + # which is usually 32 pages on Linux (see "man execve"). + # + # Assumption: We don't have to consider ARG_MAX, i.e. the maximum + # size of argv + envp, because it is derived from RLIMIT_STACK + # and large enough. + try: + max_length = 32 * os.sysconf("SC_PAGESIZE") // 2 + except ValueError: + max_length = 32 * 4046 // 2 + + def format_(value): + if len(value) > max_length: + value = value[:max_length] + "...\nAttention: Removed remaining content because it was too long." + return value.encode("utf-8") + + notify_env = { + "NOTIFY_" + variable: format_(value) for variable, value in plugin_context.iteritems() + } + notify_env.update(os.environ) + return notify_env class NotificationTimeout(Exception):

5 years, 3 months

7221 FIX check_http: proxy settings for cert check

by Moritz Kiemer

Module: check_mk Branch: master Commit: a0de9801d9cb3306a590893407c55e14f9195006 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0de9801d9cb33… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Mar 21 12:44:55 2019 +0100 7221 FIX check_http: proxy settings for cert check Previously the proxy settings had been ignored when checking a certificate unless the option "Check Certificate of different IP / DNS Name" had been used. Change-Id: I230a85eac649155749e73767ad8ac54e3bce8eb7 --- .werks/7221 | 12 ++++++++++++ checks/check_http | 24 +++++++++++------------- tests/unit/checks/test_check_http.py | 2 +- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.werks/7221 b/.werks/7221 new file mode 100644 index 0000000..971717e --- /dev/null +++ b/.werks/7221 @@ -0,0 +1,12 @@ +Title: check_http: Use proxy settings for certificate check +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1553168564 +Class: fix + +Previously the proxy settings had been ignored when checking a certificate +unless the option "Check Certificate of different IP / DNS Name" had been used. + diff --git a/checks/check_http b/checks/check_http index 3f5e9fe..b493b0d 100644 --- a/checks/check_http +++ b/checks/check_http @@ -46,19 +46,17 @@ def _get_family_and_address(settings): def _certificate_args(address_family, address, settings): args = [] - if "cert_host" in settings: - if settings.get('proxy'): - args += ['-I', settings['proxy']] - args += ['-H', settings['cert_host']] - args.append('--ssl') - args += ['-j', 'CONNECT'] - elif settings.get("sni"): - args += ['-H', settings['cert_host']] - else: - args += ['-I', settings['cert_host']] - args += ['-H', address] - else: - args += ["-I", address] + server = settings.get('cert_host', address) + proxy = settings.get('proxy') + + args += ['-I', proxy or server] + + if proxy: + args += ['-H', server] + args.append('--ssl') + args += ['-j', 'CONNECT'] + elif settings.get("sni"): + args += ['-H', server] if address_family == 'ipv6': args += ['-6'] diff --git a/tests/unit/checks/test_check_http.py b/tests/unit/checks/test_check_http.py index e420a6d..f4c638d 100644 --- a/tests/unit/checks/test_check_http.py +++ b/tests/unit/checks/test_check_http.py @@ -35,7 +35,7 @@ pytestmark = pytest.mark.checks 'cert_days': (10, 20), 'cert_host': 'www.test123.com' }), - ['-I', 'www.test123.com', '-H', '$_HOSTADDRESS_4$', '-C', '10,20'], + ['-I', 'www.test123.com', '-C', '10,20'], )]) def test_check_http_argument_parsing(check_manager, params, expected_args): """Tests if all required arguments are present. The tests do not check the order of arguments."""

5 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019