Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

5671 Use RE2 regular expression engine for Livestatus queries.

by Sven Panne

Module: check_mk Branch: master Commit: e230d686a219768003ba0cdf252fe3d13415beee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e230d686a21976… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 15 13:39:58 2018 +0100 5671 Use RE2 regular expression engine for Livestatus queries. Livestatus offers various places where a regular expression can be used, e.g. in its "Filter:" header for GET queries. The previous implementation had various problems, which have all been fixed by switching to a new regular expression engine (RE2, see https://github.com/google/re2): <ul> <li>Unicode was not handled correctly: RE2 fully understands UTF-8, so this has been fixed.</li> <li>Unbounded memory usage during matching: This could lead to stack overflows and CMC/Nagios crashes when trying to match some classes of regular expressions on long inputs. RE2 guarantees that this won't happen, it either complains that a regular expression is too complicated (which is hard to provoke) or runs in constant memory afterwards.</li> <li>Exponential runtime: Some classes of regular expressions could lead to exponential runtime, blocking Livestatus threads and using CPU time for some millenia or more. RE2's runtime is linear in the size of the regular expression and the input, so this has been fixed, too.</li> </ul> As an additional bonus, most of the time RE2 is quite a bit faster than the previous implementation. RE2's regular expression syntax (https://github.com/google/re2/wiki/Syntax) is basically a superset of the previous POSIX extended regular expression syntax (http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag…), so you won't have to change your patterns. Note that one esoteric detail is different, though, namely the semantics of submatching (see https://swtch.com/~rsc/regexp/regexp2.html#posix). If you relied on this, you probably already had some problems, because almost every POSIX regex implementation out there was buggy in some way (see https://wiki.haskell.org/Regex_Posix#Results_and_Bugs). Change-Id: Ib89c152c1c1bf7809ff22b8bab879ce794386af1 --- .werks/5671 | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/.werks/5671 b/.werks/5671 new file mode 100644 index 0000000..cf0df46 --- /dev/null +++ b/.werks/5671 @@ -0,0 +1,41 @@ +Title: Use RE2 regular expression engine for Livestatus queries. +Level: 2 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518698354 +Class: feature + +Livestatus offers various places where a regular expression can be used, e.g. in +its "Filter:" header for GET queries. The previous implementation had various +problems, which have all been fixed by switching to a new regular expression +engine (RE2, see https://github.com/google/re2): + +<ul> +<li>Unicode was not handled correctly: RE2 fully understands UTF-8, so this has +been fixed.</li> +<li>Unbounded memory usage during matching: This could lead to stack overflows +and CMC/Nagios crashes when trying to match some classes of regular expressions +on long inputs. RE2 guarantees that this won't happen, it either complains that +a regular expression is too complicated (which is hard to provoke) or runs in +constant memory afterwards.</li> +<li>Exponential runtime: Some classes of regular expressions could lead to +exponential runtime, blocking Livestatus threads and using CPU time for some +millenia or more. RE2's runtime is linear in the size of the regular expression +and the input, so this has been fixed, too.</li> +</ul> + +As an additional bonus, most of the time RE2 is quite a bit faster than the +previous implementation. + +RE2's regular expression syntax (https://github.com/google/re2/wiki/Syntax) is +basically a superset of the previous POSIX extended regular expression syntax +(http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04), +so you won't have to change your patterns. + +Note that one esoteric detail is different, though, namely the semantics of +submatching (see https://swtch.com/~rsc/regexp/regexp2.html#posix). If you +relied on this, you probably already had some problems, because almost every +POSIX regex implementation out there was buggy in some way (see +https://wiki.haskell.org/Regex_Posix#Results_and_Bugs).

6 years, 7 months

checktestlib: Add __contains__ method to DiscoveryResult

by Konstantin Büttner

Module: check_mk Branch: master Commit: f459a51dc59f960c1cfc83c3358534146260f75d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f459a51dc59f96… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Feb 15 13:48:24 2018 +0100 checktestlib: Add __contains__ method to DiscoveryResult Change-Id: Iee33cdfa27d0e00ef01262752640fa753e3bbb9a --- tests/checks/checktestlib.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 80626e4..93c6425 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -171,5 +171,8 @@ class DiscoveryResult(object): return all(entry in other_value for entry in self.entries) and \ all(other_entry in self.entries for other_entry in other_value) + def __contains__(self, value): + return value in self.entries + def __repr__(self): return "DiscoveryResult(%s)" % (",\n".join([repr(entry) for entry in self.entries]))

6 years, 7 months

Fill veritas_vcs discovery test with some content

by Konstantin Büttner

Module: check_mk Branch: master Commit: 73c1c37a76b352dfe56aabf6c4fc4b294fabe931 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73c1c37a76b352… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Feb 15 13:49:11 2018 +0100 Fill veritas_vcs discovery test with some content Change-Id: I9b379e634f2ca5ff1025bf5890d1c45f2c3827df --- tests/checks/test_veritas_vcs_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checks/test_veritas_vcs_check.py b/tests/checks/test_veritas_vcs_check.py index 670df98..1e5a880 100644 --- a/tests/checks/test_veritas_vcs_check.py +++ b/tests/checks/test_veritas_vcs_check.py @@ -48,7 +48,7 @@ info1= [ [None] + line for line in node1 ] # '----------------------------------------------------------------------' @pytest.mark.parametrize("info,predicate",[ - (info1, lambda result: True), + (info1, lambda result: ("foocluster", None) in result), ]) def test_veritas_vcs_discovery_with_parse(check_manager, info, predicate): check = check_manager.get_check("veritas_vcs")

6 years, 7 months

checktestlib: Add __repr__ methods to DiscoveryEntry and DiscoveryResult

by Konstantin Büttner

Module: check_mk Branch: master Commit: 73688454b62977be67ca9ea2ff86beead488630b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73688454b62977… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Feb 15 13:26:42 2018 +0100 checktestlib: Add __repr__ methods to DiscoveryEntry and DiscoveryResult Change-Id: I62703cb1aab9fd81bc05a471253bc4370ce7996e --- tests/checks/checktestlib.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index dbabbcc..80626e4 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -148,6 +148,9 @@ class DiscoveryEntry(Tuploid): def tuple(self): return (self.item, self.default_params) + def __repr__(self): + return "DiscoveryEntry(%r, %r)" % (self.item, self.default_params) + class DiscoveryResult(object): """ @@ -167,3 +170,6 @@ class DiscoveryResult(object): def __eq__(self, other_value): return all(entry in other_value for entry in self.entries) and \ all(other_entry in self.entries for other_entry in other_value) + + def __repr__(self): + return "DiscoveryResult(%s)" % (",\n".join([repr(entry) for entry in self.entries]))

6 years, 7 months

Windows agent: move section helper functions

by Jukka Aro

Module: check_mk Branch: master Commit: 6e8bb26d0f2eb30f40da2baf56caeabe2f766a18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e8bb26d0f2eb3… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Feb 15 12:31:29 2018 +0100 Windows agent: move section helper functions Declare and define time-related helper functions in Section.* as this is where they are needed. Avoid explicitly extern-declared function declarations in source files. Fix external linkage to outside of libcheck_mk_agent.a as it is unclear how this ever worked(!). --- agents/windows/Section.cc | 23 +++++++++++++++++++++++ agents/windows/Section.h | 8 ++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 19 ------------------- agents/windows/sections/SectionFileinfo.cc | 13 ++++++------- agents/windows/sections/SectionPS.cc | 11 +++++------ agents/windows/sections/SectionSpool.cc | 5 ++--- agents/windows/sections/SectionSystemtime.cc | 5 ++--- agents/windows/sections/SectionWinperf.cc | 7 +++---- 9 files changed, 50 insertions(+), 43 deletions(-) diff --git a/agents/windows/Section.cc b/agents/windows/Section.cc index c517fb6..23e02af 100644 --- a/agents/windows/Section.cc +++ b/agents/windows/Section.cc @@ -27,6 +27,29 @@ #include "Environment.h" #include "Logger.h" +namespace section_helpers { + +static const double SEC_TO_UNIX_EPOCH = 11644473600.0; +static const double WINDOWS_TICK = 10000000.0; + +double file_time(const FILETIME *filetime) { + ULARGE_INTEGER uli{0}; + uli.LowPart = filetime->dwLowDateTime; + uli.HighPart = filetime->dwHighDateTime; + + 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, const Environment &env, Logger *logger, const WinApiAdaptor &winapi) diff --git a/agents/windows/Section.h b/agents/windows/Section.h index 0cd3864..c483499 100644 --- a/agents/windows/Section.h +++ b/agents/windows/Section.h @@ -37,6 +37,14 @@ class Environment; class Logger; +namespace section_helpers { + +double file_time(const FILETIME *filetime); + +double current_time(const WinApiAdaptor &winapi); + +} // namespace section_helpers + class Section { friend class SectionGroup; diff --git a/agents/windows/build_version b/agents/windows/build_version index 4253b05..e5bffd6 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3106 +3108 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index b56a27e..152f1f8 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -225,25 +225,6 @@ volatile bool g_should_terminate = false; // | Global helper functions | // '----------------------------------------------------------------------' -double file_time(const FILETIME *filetime) { - static const double SEC_TO_UNIX_EPOCH = 11644473600.0; - static const double WINDOWS_TICK = 10000000.0; - - _ULARGE_INTEGER uli; - uli.LowPart = filetime->dwLowDateTime; - uli.HighPart = filetime->dwHighDateTime; - - return (double(uli.QuadPart) / WINDOWS_TICK) - SEC_TO_UNIX_EPOCH; -} - -double current_time() { - SYSTEMTIME systime; - FILETIME filetime; - s_winapi.GetSystemTime(&systime); - s_winapi.SystemTimeToFileTime(&systime, &filetime); - return file_time(&filetime); -} - template <typename T> bool in_set(const T &val, const std::set<T> &test_set) { return test_set.find(val) != test_set.end(); diff --git a/agents/windows/sections/SectionFileinfo.cc b/agents/windows/sections/SectionFileinfo.cc index 3eb4178..b111aab 100644 --- a/agents/windows/sections/SectionFileinfo.cc +++ b/agents/windows/sections/SectionFileinfo.cc @@ -28,9 +28,6 @@ #include <sstream> #include "Logger.h" -extern double current_time(); -extern double file_time(const FILETIME *filetime); - SectionFileinfo::SectionFileinfo(Configuration &config, Logger *logger, const WinApiAdaptor &winapi) : Section("fileinfo", "fileinfo", config.getEnvironment(), logger, winapi) @@ -40,7 +37,8 @@ SectionFileinfo::SectionFileinfo(Configuration &config, Logger *logger, bool SectionFileinfo::produceOutputInner(std::ostream &out) { Debug(_logger) << "SectionFileinfo::produceOutputInner"; - out << std::fixed << std::setprecision(0) << current_time() << "\n"; + out << std::fixed << std::setprecision(0) + << section_helpers::current_time(_winapi) << "\n"; for (const std::string &path : *_fileinfo_paths) { outputFileinfos(out, path.c_str()); @@ -136,7 +134,8 @@ void SectionFileinfo::outputFileinfos(std::ostream &out, const char *path) { } if (!found_file) { - out << path << "|missing|" << current_time() << "\n"; + out << path << "|missing|" << section_helpers::current_time(_winapi) + << "\n"; } } @@ -150,8 +149,8 @@ bool SectionFileinfo::outputFileinfo(std::ostream &out, (unsigned long long)findData.nFileSizeLow + (((unsigned long long)findData.nFileSizeHigh) << 32); out << filename << "|" << size << "|" << std::fixed - << std::setprecision(0) << file_time(&findData.ftLastWriteTime) - << "\n"; + << std::setprecision(0) + << section_helpers::file_time(&findData.ftLastWriteTime) << "\n"; return true; } return false; diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index 850dfc4..45b7b95 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -29,9 +29,6 @@ #include "PerfCounter.h" #include "dynamic_func.h" -extern double file_time(const FILETIME *filetime); -extern double current_time(); - SectionPS::SectionPS(Configuration &config, Logger *logger, const WinApiAdaptor &winapi) : Section("ps", "ps", config.getEnvironment(), logger, winapi) @@ -203,7 +200,8 @@ 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)current_time() - creation_time); + auto uptime = (ULONGLONG)( + (time_t)section_helpers::current_time(_winapi) - creation_time); outputProcess( out, std::stoull(result.get<std::string>(L"VirtualSize")), @@ -310,8 +308,9 @@ bool SectionPS::outputNative(std::ostream &out) { } // Uptime - double ft = file_time(&createTime); - ULONGLONG uptime = (ULONGLONG)(current_time() - ft); + double ft = section_helpers::file_time(&createTime); + ULONGLONG uptime = + (ULONGLONG)(section_helpers::current_time(_winapi) - ft); // Note: CPU utilization is determined out of usermodetime and // kernelmodetime diff --git a/agents/windows/sections/SectionSpool.cc b/agents/windows/sections/SectionSpool.cc index 1efe4a3..f9ec66f 100644 --- a/agents/windows/sections/SectionSpool.cc +++ b/agents/windows/sections/SectionSpool.cc @@ -32,8 +32,6 @@ namespace fs = std::experimental::filesystem; -extern double file_time(const FILETIME *filetime); - SectionSpool::SectionSpool(const Environment &env, Logger *logger, const WinApiAdaptor &winapi) : Section("spool", "spool", env, logger, winapi) { @@ -63,7 +61,8 @@ bool SectionSpool::produceOutputInner(std::ostream &out) { FindExSearchNameMatch, NULL, 0), _winapi}; if (searchHandle) { - double mtime = file_time(&(filedata.ftLastWriteTime)); + double mtime = + section_helpers::file_time(&(filedata.ftLastWriteTime)); int age = now - mtime; if (age > max_age) { Informational(_logger) diff --git a/agents/windows/sections/SectionSystemtime.cc b/agents/windows/sections/SectionSystemtime.cc index 5953639..fa31b17 100644 --- a/agents/windows/sections/SectionSystemtime.cc +++ b/agents/windows/sections/SectionSystemtime.cc @@ -26,14 +26,13 @@ #include <iomanip> #include "Logger.h" -extern double current_time(); - SectionSystemtime::SectionSystemtime(const Environment &env, Logger *logger, const WinApiAdaptor &winapi) : Section("systemtime", "systemtime", env, logger, winapi) {} bool SectionSystemtime::produceOutputInner(std::ostream &out) { Debug(_logger) << "SectionSystemtime::produceOutputInner"; - out << std::fixed << std::setprecision(0) << current_time(); + out << std::fixed << std::setprecision(0) + << section_helpers::current_time(_winapi); return true; } diff --git a/agents/windows/sections/SectionWinperf.cc b/agents/windows/sections/SectionWinperf.cc index 1d66638..7d174f5 100644 --- a/agents/windows/sections/SectionWinperf.cc +++ b/agents/windows/sections/SectionWinperf.cc @@ -30,8 +30,6 @@ #include "PerfCounter.h" #include "stringutil.h" -extern double current_time(); - SectionWinperf::SectionWinperf(const std::string &name, const Environment &env, Logger *logger, const WinApiAdaptor &winapi) : Section("winperf_" + name, "winperf_" + name, env, logger, winapi) @@ -50,8 +48,9 @@ bool SectionWinperf::produceOutputInner(std::ostream &out) { if (!counterObject.isEmpty()) { LARGE_INTEGER Frequency; _winapi.QueryPerformanceFrequency(&Frequency); - out << std::fixed << std::setprecision(2) << current_time() << " " - << _base << " " << Frequency.QuadPart << "\n"; + out << std::fixed << std::setprecision(2) + << section_helpers::current_time(_winapi) << " " << _base << " " + << Frequency.QuadPart << "\n"; std::vector<PERF_INSTANCE_DEFINITION *> instances = counterObject.instances();

6 years, 7 months

Windows: update MinGW-w64 and gcc version in README

by Jukka Aro

Module: check_mk Branch: master Commit: ed4f58a35d31360a5557543979c59ea29d0a5108 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed4f58a35d3136… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Feb 15 10:19:03 2018 +0100 Windows: update MinGW-w64 and gcc version in README --- agents/windows/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/README b/agents/windows/README index e01faad..428f088 100644 --- a/agents/windows/README +++ b/agents/windows/README @@ -79,7 +79,7 @@ ** Compilation dependencies -Currently mingw-w64 5.0.1-1 (http://mingw-w64.org), based on gcc 6.2.1, is used to build the agent. +Currently mingw-w64 5.0.3 (http://mingw-w64.org), based on gcc 7.2.0, is used to build the agent. The compilation uses GNU autotools and takes place within a chroot jail. The bash script 'make-agent' (sudo necessary!) is used for setting up the chroot jail and executing the desired build steps within it.

6 years, 7 months

Trivial test for veritas_vcs

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4b57a2f64096cb080690e8eb2de34f066d508131 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b57a2f64096cb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Feb 15 10:11:38 2018 +0100 Trivial test for veritas_vcs Change-Id: I8e240ff6a9b1f3d1e9f8042de83b5eb4c0efe37f --- tests/checks/test_veritas_vcs_check.py | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/tests/checks/test_veritas_vcs_check.py b/tests/checks/test_veritas_vcs_check.py new file mode 100644 index 0000000..670df98 --- /dev/null +++ b/tests/checks/test_veritas_vcs_check.py @@ -0,0 +1,56 @@ +import pytest +import checktestlib + +pytestmark = pytest.mark.checks + +# .--Test info sections--------------------------------------------------. +# | _____ _ _ __ | +# | |_ _|__ ___| |_ (_)_ __ / _| ___ | +# | | |/ _ \/ __| __| | | '_ \| |_ / _ \ | +# | | | __/\__ \ |_ | | | | | _| (_) | | +# | |_|\___||___/\__| |_|_| |_|_| \___/ | +# | | +# | _ _ | +# | ___ ___ ___| |_(_) ___ _ __ ___ | +# | / __|/ _ \/ __| __| |/ _ \| '_ \/ __| | +# | \__ \ __/ (__| |_| | (_) | | | \__ \ | +# | |___/\___|\___|\__|_|\___/|_| |_|___/ | +# | | +# '----------------------------------------------------------------------' + +node1 = [ + ["ClusState", "RUNNING"], + ["ClusterName", "foocluster"], + ["#System", "Attribute", "Value"], + ["bar", "SysState", "RUNNING"], + ["baz", "SysState", "RUNNING"], + ["#Group", "Attribute", "System", "Value"], + ["ClusterService", "State", "baz", "|OFFLINE|"], + ["something1", "State", "baz", "|OFFLINE|"], + ["something2", "State", "baz", "|OFFLINE|"], + ["something3", "State", "baz", "|OFFLINE|"], + ["otherthing1", "State", "baz", "|ONLINE|"], + ["#Resource", "Attribute", "System", "Value"], + ["minerals", "State", "baz", "ONLINE"], + ["vespgas", "State", "baz", "OFFLINE"], +] + +info1= [ [None] + line for line in node1 ] + +#. +# .--Test functions------------------------------------------------------. +# | _____ _ __ _ _ | +# | |_ _|__ ___| |_ / _|_ _ _ __ ___| |_(_) ___ _ __ ___ | +# | | |/ _ \/ __| __| | |_| | | | '_ \ / __| __| |/ _ \| '_ \/ __| | +# | | | __/\__ \ |_ | _| |_| | | | | (__| |_| | (_) | | | \__ \ | +# | |_|\___||___/\__| |_| \__,_|_| |_|\___|\__|_|\___/|_| |_|___/ | +# | | +# '----------------------------------------------------------------------' + +(a)pytest.mark.parametrize("info,predicate",[ + (info1, lambda result: True), +]) +def test_veritas_vcs_discovery_with_parse(check_manager, info, predicate): + check = check_manager.get_check("veritas_vcs") + result = checktestlib.DiscoveryResult(check.run_discovery(check.run_parse(info))) + assert predicate(result)

6 years, 7 months

mkbackup: Use dynamic (platform dependent) interface name instead of hard coded eth0

by Lars Michelsen

Module: check_mk Branch: master Commit: 37b6a7252a275d4335d1b3cd5ec4e0cb3c9aa338 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37b6a7252a275d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 14 17:54:33 2018 +0100 mkbackup: Use dynamic (platform dependent) interface name instead of hard coded eth0 Change-Id: I39b7f350cb542b1c38966c9a9bec25cf3c4a9417 --- bin/mkbackup | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/mkbackup b/bin/mkbackup index b761368..1b5960d 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -1649,7 +1649,8 @@ def setup_cluster_environment(info): # To be able to start the DRBD volume we need to have the IP # addresses configured in the DRBD config active. Simply activate - # all IP addresses of the host on eth0. Will be cleaned up by reboot. + # all IP addresses of the host on the primary network interface. + # This will be cleaned up by reboot. enable_drbd_ip_addresses() cma.initialize_drbd() @@ -1681,7 +1682,7 @@ def enable_drbd_ip_addresses(): log("Enabling DRBD network address (%s: %s/%s)" % (drbd_if, address, netmask)) subprocess.call(["ip", "a", "a", "%s/%s" % (address, netmask), - "dev", "eth0"]) + "dev", cma_net.get_simple_interface_name()]) def verify_cma_version_compatible(info):

6 years, 7 months

Adapted test

by Simon Betz

Module: check_mk Branch: master Commit: f8833dd3c665687161e2d700c450ac3b65e58dcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8833dd3c66568… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 14 16:40:17 2018 +0100 Adapted test Change-Id: I48b5cd3f0541d13d769c14d0048b9db385415715 --- tests/cmk/structured_data/test_structured_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cmk/structured_data/test_structured_data.py b/tests/cmk/structured_data/test_structured_data.py index 8f74ffa..8e7e572 100644 --- a/tests/cmk/structured_data/test_structured_data.py +++ b/tests/cmk/structured_data/test_structured_data.py @@ -476,7 +476,7 @@ def test_structured_data_StructuredDataTree_get_root_container(tree): @pytest.mark.parametrize("tree,paths,unavail", [ (tree_new_interfaces, # container numeration attributes - [["hardware", "components"], ["networking", "interfaces"], ["software", "os"]], + [(["hardware", "components"], None), (["networking", "interfaces"], None), (["software", "os"], None)], [["hardware", "system"], ["software", "applications"]]), ]) def test_structured_data_StructuredDataTree_filtered_tree(tree, paths, unavail):

6 years, 7 months

Windows agent: clear global variable g_script_stat

by Jukka Aro

Module: check_mk Branch: master Commit: bd2fff7f72ad7979ba75efd66cb94721cf56ded9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd2fff7f72ad79… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Feb 14 16:37:11 2018 +0100 Windows agent: clear global variable g_script_stat Use member variable for script statistics and pass a reference to it to the two sections that need it. --- agents/windows/SectionManager.cc | 13 +++++++---- agents/windows/SectionManager.h | 1 + agents/windows/build_version | 2 +- agents/windows/sections/SectionCheckMK.cc | 29 ++++++++++------------- agents/windows/sections/SectionCheckMK.h | 5 +++- agents/windows/sections/SectionPluginGroup.cc | 33 ++++++++++----------------- agents/windows/sections/SectionPluginGroup.h | 12 +++------- agents/windows/types.h | 22 ++++++++++++++++++ 8 files changed, 63 insertions(+), 54 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bd2fff7f72…

6 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018