Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

5776 FIX win_reg_uninstall: Fixed transposed month and day fields of dates which caused ' Inventory failed: unconverted data remains'

by Simon Betz

Module: check_mk Branch: master Commit: f35cd8409744914bb15eaa4aa21df13b7cda9c0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f35cd840974491… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 19 16:13:44 2018 +0100 5776 FIX win_reg_uninstall: Fixed transposed month and day fields of dates which caused 'Inventory failed: unconverted data remains' Change-Id: Ifbc96ab68ed1186d71a63ec0a5ea0ed4d7b7d514 --- .werks/5776 | 11 +++++++++++ inventory/win_reg_uninstall | 28 ++++++++++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/.werks/5776 b/.werks/5776 new file mode 100644 index 0000000..16ffb4f --- /dev/null +++ b/.werks/5776 @@ -0,0 +1,11 @@ +Title: win_reg_uninstall: Fixed transposed month and day fields of dates which caused 'Inventory failed: unconverted data remains' +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1521472345 + + diff --git a/inventory/win_reg_uninstall b/inventory/win_reg_uninstall index a8d3c0f..90c7904 100644 --- a/inventory/win_reg_uninstall +++ b/inventory/win_reg_uninstall @@ -31,25 +31,33 @@ def inv_win_reg_uninstall(info): paclist = inv_tree_list("software.packages:") for line in info: - if len(line) == 7: + if len(line) == 7: display_name, publisher, path, pacname, version, estimated_size, date = line - language = "" - elif len(line) == 8: + language = "" + elif len(line) == 8: display_name, publisher, path, pacname, version, estimated_size, date, language = line - else: - continue + else: + continue install_date = None if re.match("^20\d{6}", date): - install_date = int(time.mktime(time.strptime(date, "%Y%m%d"))) + # Dates look like '20160930', but we saw also dates like '20132804' + # which have transposed month and day fields. + try: + install_date = int(time.mktime(time.strptime(date, "%Y%m%d"))) + except ValueError: + try: + install_date = int(time.mktime(time.strptime(date, "%Y%d%m"))) + except ValueError: + pass size = saveint(estimated_size) if size == 0: size = None - if pacname.startswith("{"): - pacname = display_name - if pacname == "": - continue + if pacname.startswith("{"): + pacname = display_name + if pacname == "": + continue entry = { "name" : pacname,

6 years, 3 months

Win-agent: cope with a weird Linux desktop bug

by Jukka Aro

Module: check_mk Branch: master Commit: 9679ce1b6a52a01bc8bcdd2bedd220a0ace6507e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9679ce1b6a52a0… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Mar 19 15:40:13 2018 +0100 Win-agent: cope with a weird Linux desktop bug For some weird reason, saving the target dir for 'cd' in an intermediate variable is necessary to prevent some desktop env's (at least Cinnamon) from opening a fresh file manager window when run in chroot! Please do not ask why... --- agents/windows/build-agent | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/agents/windows/build-agent b/agents/windows/build-agent index 0a04c7c..abd8437 100755 --- a/agents/windows/build-agent +++ b/agents/windows/build-agent @@ -18,8 +18,11 @@ set -e . /$CHROOT_BUILD_DIR/agents/windows/build.sh parse-args "$@" - -cd /$CHROOT_BUILD_DIR/agents/windows +# For some weird reason, saving the target dir for 'cd' in an intermediate +# variable is necessary to prevent some desktop env's (at least Cinnamon) +# from opening a fresh file manager window! Please do not ask why... +windowsdir="/$CHROOT_BUILD_DIR/agents/windows" +cd "$windowsdir" autoreconf --install

6 years, 3 months

Win-agent: replace WinAPI GetSystemTime

by Jukka Aro

Module: check_mk Branch: master Commit: 34d27892aa22919399d7e4de80e7708e4f99a26d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34d27892aa2291… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Mar 19 15:11:03 2018 +0100 Win-agent: replace WinAPI GetSystemTime Use std::chrono::system_clock and other utilities in std::chrono instead. --- agents/windows/build_version | 2 +- agents/windows/sections/Section.cc | 8 -------- agents/windows/sections/Section.h | 8 +++++++- agents/windows/sections/SectionFileinfo.cc | 6 ++---- agents/windows/sections/SectionPS.cc | 7 ++++--- agents/windows/sections/SectionSystemtime.cc | 3 +-- agents/windows/sections/SectionWinperf.cc | 5 +++-- 7 files changed, 18 insertions(+), 21 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 02c434d..19d718c 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3190 +3192 diff --git a/agents/windows/sections/Section.cc b/agents/windows/sections/Section.cc index 41eadd4..ea2380e 100644 --- a/agents/windows/sections/Section.cc +++ b/agents/windows/sections/Section.cc @@ -40,14 +40,6 @@ double file_time(const FILETIME *filetime) { return (double(uli.QuadPart) / WINDOWS_TICK) - SEC_TO_UNIX_EPOCH; } -double current_time(const WinApiAdaptor &winapi) { - SYSTEMTIME systime{0}; - FILETIME filetime{0}; - winapi.GetSystemTime(&systime); - winapi.SystemTimeToFileTime(&systime, &filetime); - return file_time(&filetime); -} - } // namespace section_helpers Section::Section(const std::string &outputName, const std::string &configName, diff --git a/agents/windows/sections/Section.h b/agents/windows/sections/Section.h index 92484fa..4e9d273 100644 --- a/agents/windows/sections/Section.h +++ b/agents/windows/sections/Section.h @@ -42,7 +42,13 @@ namespace section_helpers { double file_time(const FILETIME *filetime); -double current_time(const WinApiAdaptor &winapi); +template <class ToDuration = std::chrono::seconds, class Rep = long long> +inline Rep current_time() { + const std::chrono::duration<Rep> now = + std::chrono::duration_cast<ToDuration>( + std::chrono::system_clock::now().time_since_epoch()); + return now.count(); +} } // namespace section_helpers diff --git a/agents/windows/sections/SectionFileinfo.cc b/agents/windows/sections/SectionFileinfo.cc index 2f7e5e2..a3a51a1 100644 --- a/agents/windows/sections/SectionFileinfo.cc +++ b/agents/windows/sections/SectionFileinfo.cc @@ -36,8 +36,7 @@ SectionFileinfo::SectionFileinfo(Configuration &config, Logger *logger, bool SectionFileinfo::produceOutputInner(std::ostream &out, const std::optional<std::string> &) { Debug(_logger) << "SectionFileinfo::produceOutputInner"; - out << std::fixed << std::setprecision(0) - << section_helpers::current_time(_winapi) << "\n"; + out << std::fixed << section_helpers::current_time() << "\n"; for (const std::string &path : *_fileinfo_paths) { outputFileinfos(out, path.c_str()); @@ -133,8 +132,7 @@ void SectionFileinfo::outputFileinfos(std::ostream &out, const char *path) { } if (!found_file) { - out << path << "|missing|" << section_helpers::current_time(_winapi) - << "\n"; + out << path << "|missing|" << section_helpers::current_time() << "\n"; } } diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index 70129dc..df0598c 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -199,8 +199,9 @@ bool SectionPS::outputWMI(std::ostream &out) { std::tm t; ss >> std::get_time(&t, L"%Y%m%d%H%M%S"); time_t creation_time = mktime(&t); - auto uptime = (ULONGLONG)( - (time_t)section_helpers::current_time(_winapi) - creation_time); + auto uptime = static_cast<ULONGLONG>( + static_cast<time_t>(section_helpers::current_time()) - + creation_time); outputProcess( out, std::stoull(result.get<std::string>(L"VirtualSize")), @@ -309,7 +310,7 @@ bool SectionPS::outputNative(std::ostream &out) { // Uptime double ft = section_helpers::file_time(&createTime); ULONGLONG uptime = - (ULONGLONG)(section_helpers::current_time(_winapi) - ft); + static_cast<ULONGLONG>(section_helpers::current_time() - ft); // Note: CPU utilization is determined out of usermodetime and // kernelmodetime diff --git a/agents/windows/sections/SectionSystemtime.cc b/agents/windows/sections/SectionSystemtime.cc index 99d7c81..bbb59c3 100644 --- a/agents/windows/sections/SectionSystemtime.cc +++ b/agents/windows/sections/SectionSystemtime.cc @@ -33,7 +33,6 @@ SectionSystemtime::SectionSystemtime(const Environment &env, Logger *logger, bool SectionSystemtime::produceOutputInner(std::ostream &out, const std::optional<std::string> &) { Debug(_logger) << "SectionSystemtime::produceOutputInner"; - out << std::fixed << std::setprecision(0) - << section_helpers::current_time(_winapi); + out << std::fixed << section_helpers::current_time(); return true; } diff --git a/agents/windows/sections/SectionWinperf.cc b/agents/windows/sections/SectionWinperf.cc index c2ca010..cc4d72e 100644 --- a/agents/windows/sections/SectionWinperf.cc +++ b/agents/windows/sections/SectionWinperf.cc @@ -50,8 +50,9 @@ bool SectionWinperf::produceOutputInner(std::ostream &out, LARGE_INTEGER Frequency; _winapi.QueryPerformanceFrequency(&Frequency); out << std::fixed << std::setprecision(2) - << section_helpers::current_time(_winapi) << " " << _base << " " - << Frequency.QuadPart << "\n"; + << section_helpers::current_time<std::chrono::milliseconds, + double>() + << " " << _base << " " << Frequency.QuadPart << "\n"; std::vector<PERF_INSTANCE_DEFINITION *> instances = counterObject.instances();

6 years, 3 months

Win-agent: move Section.* to subdir sections

by Jukka Aro

Module: check_mk Branch: master Commit: bc44dd8d6c265b092eecbb621245488448d42152 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc44dd8d6c265b… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Mar 19 13:18:18 2018 +0100 Win-agent: move Section.* to subdir sections Also avoid relative include paths by providing the include path to sections with the compiler option -I. --- agents/windows/Makefile.am | 9 ++++---- agents/windows/SectionManager.cc | 36 ++++++++++++++++---------------- agents/windows/build_version | 2 +- agents/windows/{ => sections}/Section.cc | 0 agents/windows/{ => sections}/Section.h | 0 agents/windows/test/stringutilTest.cc | 2 +- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index f5b990c..53f5670 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -4,14 +4,15 @@ noinst_LIBRARIES = libcheck_mk_agent.a noinst_PROGRAMS = MontyPython AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -O2 -Wformat=2 -Werror -Wall -fno-rtti -std=c++17 -gdwarf-2 \ - -DCHECK_MK_VERSION='"$(VERSION)"' -D__USE_MINGW_ANSI_STDIO -DSI_SUPPORT_IOSTREAMS +AM_CPPFLAGS = -I$(top_srcdir)/sections -O2 -Wformat=2 -Werror -Wall -fno-rtti \ + -std=c++17 -gdwarf-2 -DCHECK_MK_VERSION='"$(VERSION)"' \ + -D__USE_MINGW_ANSI_STDIO -DSI_SUPPORT_IOSTREAMS AM_LDFLAGS = -static -static-libgcc -static-libstdc++ LD_COMMON = -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -lstdc++fs check_mk_agent_LDADD = check_mk_agent.res libcheck_mk_agent.a $(LD_COMMON) -WindowsAgentTest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/sections -I$(top_srcdir)/test +WindowsAgentTest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/test WindowsAgentTest_LDADD = libcheck_mk_agent.a -lgtest -lgmock $(LD_COMMON) wmitest_LDADD = $(LD_COMMON) @@ -75,7 +76,6 @@ libcheck_mk_agent_a_SOURCES = \ PerfCounter.cc \ PerfCounterCommon.cc \ RotatingFileHandler.cc \ - Section.cc \ SectionManager.cc \ SettingsCollector.cc \ Thread.cc \ @@ -85,6 +85,7 @@ libcheck_mk_agent_a_SOURCES = \ types.cc \ win_error.cc \ wmiHelper.cc \ + sections/Section.cc \ sections/SectionCheckMK.cc \ sections/SectionDF.cc \ sections/SectionEventlog.cc \ diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index a361768..1f37d13 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -3,24 +3,24 @@ #include "Configuration.h" #include "Environment.h" #include "PerfCounterCommon.h" -#include "sections/SectionCheckMK.h" -#include "sections/SectionDF.h" -#include "sections/SectionEventlog.h" -#include "sections/SectionFileinfo.h" -#include "sections/SectionGroup.h" -#include "sections/SectionLogwatch.h" -#include "sections/SectionMRPE.h" -#include "sections/SectionMem.h" -#include "sections/SectionOHM.h" -#include "sections/SectionPS.h" -#include "sections/SectionPluginGroup.h" -#include "sections/SectionServices.h" -#include "sections/SectionSkype.h" -#include "sections/SectionSpool.h" -#include "sections/SectionSystemtime.h" -#include "sections/SectionUptime.h" -#include "sections/SectionWMI.h" -#include "sections/SectionWinperf.h" +#include "SectionCheckMK.h" +#include "SectionDF.h" +#include "SectionEventlog.h" +#include "SectionFileinfo.h" +#include "SectionGroup.h" +#include "SectionLogwatch.h" +#include "SectionMRPE.h" +#include "SectionMem.h" +#include "SectionOHM.h" +#include "SectionPS.h" +#include "SectionPluginGroup.h" +#include "SectionServices.h" +#include "SectionSkype.h" +#include "SectionSpool.h" +#include "SectionSystemtime.h" +#include "SectionUptime.h" +#include "SectionWMI.h" +#include "SectionWinperf.h" namespace { // Fix possible backwards incompatibility of section names by mapping diff --git a/agents/windows/build_version b/agents/windows/build_version index 21e9912..02c434d 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3188 +3190 diff --git a/agents/windows/Section.cc b/agents/windows/sections/Section.cc similarity index 100% rename from agents/windows/Section.cc rename to agents/windows/sections/Section.cc diff --git a/agents/windows/Section.h b/agents/windows/sections/Section.h similarity index 100% rename from agents/windows/Section.h rename to agents/windows/sections/Section.h diff --git a/agents/windows/test/stringutilTest.cc b/agents/windows/test/stringutilTest.cc index 80b0db7..b1b1a2b 100644 --- a/agents/windows/test/stringutilTest.cc +++ b/agents/windows/test/stringutilTest.cc @@ -1,6 +1,6 @@ +#include "SectionEventlog.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "sections/SectionEventlog.h" #include "types.h" using std::string;

6 years, 3 months

Win-agent: remove dead code in Section.h

by Jukka Aro

Module: check_mk Branch: master Commit: 0aabb1aa5eef2a54b8c23c86ea3416ff1e6e695e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0aabb1aa5eef2a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Mar 19 13:00:11 2018 +0100 Win-agent: remove dead code in Section.h The member function isEnabled was not in use. --- agents/windows/Section.h | 1 - agents/windows/build_version | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/agents/windows/Section.h b/agents/windows/Section.h index 489c765..92484fa 100644 --- a/agents/windows/Section.h +++ b/agents/windows/Section.h @@ -65,7 +65,6 @@ public: * to complete **/ virtual std::vector<HANDLE> stopAsync() { return {}; } - virtual bool isEnabled() const { return true; } bool produceOutput(std::ostream &out, const std::optional<std::string> &remoteIP, diff --git a/agents/windows/build_version b/agents/windows/build_version index 55b22ed..21e9912 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3186 +3188

6 years, 3 months

fixed werk typo

by Andreas Boesl

Module: check_mk Branch: master Commit: 8423fd7f754e561989efd3bd78f434713a895d8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8423fd7f754e56… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 19 12:01:16 2018 +0100 fixed werk typo Change-Id: Idf4a535efa7952695fe60e2df9efe1dfe15d31a1 --- .werks/5783 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/5783 b/.werks/5783 index ba78713..8e70a2a 100644 --- a/.werks/5783 +++ b/.werks/5783 @@ -10,7 +10,7 @@ Class: feature A new mechanism has been introduced allowing certain tasks to be run as background processes. Currently the following areas are included <ul> -<li>Host rennaming</li> +<li>Host renaming</li> <li>Agent baking (Enterprise Edition)</li> <li>Report generation (Enterprise Edition)</li> </ul>

6 years, 3 months

Win-agent: clean unnecessary parentheses

by Jukka Aro

Module: check_mk Branch: master Commit: 48376f76310723ccc4cfcf4080e29935be67c626 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48376f76310723… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Mar 19 11:14:43 2018 +0100 Win-agent: clean unnecessary parentheses --- agents/windows/SectionManager.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index dc90e01..a361768 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -132,9 +132,9 @@ void SectionManager::loadStaticSections(Configuration &config, addSection(new SectionCheckMK(config, only_from, _script_statistics, _logger, _winapi)); addSection(new SectionUptime(_env, _logger, _winapi)); - addSection((new SectionDF(_env, _logger, _winapi))); + addSection(new SectionDF(_env, _logger, _winapi)); addSection(new SectionPS(config, _logger, _winapi)); - addSection((new SectionMem(_env, _logger, _winapi))); + addSection(new SectionMem(_env, _logger, _winapi)); addSection(new SectionFileinfo(config, _logger, _winapi)); addSection(new SectionServices(_env, _logger, _winapi));

6 years, 3 months

5775 FIX Fixed missing McAfee AV client baklet for Windows systems

by Simon Betz

Module: check_mk Branch: master Commit: 9795438fb4c05e23eb4025357ca286ce340a7228 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9795438fb4c05e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 19 10:35:23 2018 +0100 5775 FIX Fixed missing McAfee AV client baklet for Windows systems Change-Id: I3f9713100150486439db8801c2055129db37ff19 --- .werks/5775 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5775 b/.werks/5775 new file mode 100644 index 0000000..5ec0c18 --- /dev/null +++ b/.werks/5775 @@ -0,0 +1,11 @@ +Title: Fixed missing McAfee AV client baklet for Windows systems +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i4 +Date: 1521452086 + +

6 years, 3 months

5905 FIX Configured "Receive fallback notifications" attribute of users was not displayed correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 14a9c443b6d53a83f9273fa24394d64ca19a119d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14a9c443b6d53a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 16 14:19:26 2018 +0100 5905 FIX Configured "Receive fallback notifications" attribute of users was not displayed correctly The option was correctly saved for users, but always displayed as "unchecked" checkbox when editing a user. Change-Id: I5c300e3e826683688607a9398fb58b796638eb35 --- .werks/5905 | 12 ++++++++++++ web/htdocs/wato.py | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5905 b/.werks/5905 new file mode 100644 index 0000000..c0f9d39 --- /dev/null +++ b/.werks/5905 @@ -0,0 +1,12 @@ +Title: Configured "Receive fallback notifications" attribute of users was not displayed correctly +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1521206306 + +The option was correctly saved for users, but always displayed as "unchecked" checkbox when +editing a user. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3fb5faa..64fcb56 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11453,7 +11453,8 @@ def mode_edit_user(phase): else: forms.section(_("Fallback notifications"), simple=True) - html.checkbox("fallback_contact", False, label = _("Receive fallback notifications")) + html.checkbox("fallback_contact", user.get("fallback_contact", False), + label = _("Receive fallback notifications")) html.help(_("In case none of your notification rules handles a certain event a notification " "will be sent to this contact. This makes sure that in that case at least <i>someone</i> "

6 years, 3 months

5751 FIX Add contact group contacts of EC rule if host is not a core host

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 37ea1d93bcc628ecb21e89ee440bc3ed25df7214 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37ea1d93bcc628… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Mar 15 16:21:09 2018 +0100 5751 FIX Add contact group contacts of EC rule if host is not a core host When an event was received that did not belong to a host in the monitoring the contacts of the contact groups specified in a Event Console rule were not added to the notification context if the option "Host's contact groups have precedence" was set in the Event Console rule. Now the contacts of the specified contact groups are added even when the option is set. Change-Id: I1a98fb4ddf5f6c2bca3022f6ff7946206e51a938 --- .werks/5751 | 14 ++++++++++++++ cmk/ec/main.py | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/5751 b/.werks/5751 new file mode 100644 index 0000000..5b973a8 --- /dev/null +++ b/.werks/5751 @@ -0,0 +1,14 @@ +Title: Add contact group contacts of EC rule if host is not a core host +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521126878 +Class: fix + +When an event was received that did not belong to a host in the monitoring the +contacts of the contact groups specified in a Event Console rule were not +added to the notification context if the option "Host's contact groups have +precedence" was set in the Event Console rule. Now the contacts of the +specified contact groups are added even when the option is set. diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 180f652..c36f3ac 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -4587,7 +4587,8 @@ def add_contacts_from_rule(context, event): if event.get("contact_groups") is not None and \ event.get("contact_groups_notify") and ( "CONTACTS" not in context or - event.get("contact_groups_precedence", "host") != "host"): + event.get("contact_groups_precedence", "host") != "host" or + not event['core_host']): add_contact_information_to_context(context, event["contact_groups"]) # "CONTACTS" is allowed to be missing in the context, cmk --notify will

6 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018