Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

5487 FIX isc_dhcpd: Resolve performance issues

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1727cef7039a1472d48094a241d0606e8311190a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1727cef7039a14… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Jan 10 09:39:55 2018 +0100 5487 FIX isc_dhcpd: Resolve performance issues Resolves performance issues which could lead to a timeout when a large amount of pools and leases were present. Change-Id: Iddcc108b4282baabcd6c42b6f3845e87127a3688 --- .werks/5487 | 11 +++++++++++ checks/isc_dhcpd | 40 +++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.werks/5487 b/.werks/5487 new file mode 100644 index 0000000..93ac1fb --- /dev/null +++ b/.werks/5487 @@ -0,0 +1,11 @@ +Title: isc_dhcpd: Resolve performance issues +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1515573287 +Class: fix + +Resolves performance issues which could lead to a timeout when a large amount +of pools and leases were present. diff --git a/checks/isc_dhcpd b/checks/isc_dhcpd index 2ebfe16..e20119a 100644 --- a/checks/isc_dhcpd +++ b/checks/isc_dhcpd @@ -46,10 +46,18 @@ isc_dhcpd_default_levels = (15.0, 5.0) # 10.0.1.57 def parse_isc_dhcpd(info): + def ip_to_number(ip): + number = 0 + factor = 1 + for part in ip.split('.')[::-1]: + number += factor * int(part) + factor *= 256 + return number + parsed = { - "pids" : [], - "pools" : [], - "leases" : [], + "pids": [], + "pools": {}, + "leases": [], } mode = None @@ -66,10 +74,12 @@ def parse_isc_dhcpd(info): parsed["pids"] = map(int, line[1:]) elif mode == "pools": - parsed["pools"].append((line[0], line[1])) + start, end = line[0], line[1] + item = "%s-%s" % (start, end) + parsed["pools"][item] = (ip_to_number(start), ip_to_number(end)) elif mode == "leases": - parsed["leases"].append(line[0]) + parsed["leases"].append(ip_to_number(line[0])) return parsed @@ -89,8 +99,7 @@ def parse_isc_dhcpd(info): def inventory_isc_dhcpd(parsed): - return [ ("%s-%s" % pool, "isc_dhcpd_default_levels") - for pool in parsed["pools"] ] + return [(item, "isc_dhcpd_default_levels") for item in parsed["pools"]] def check_isc_dhcpd(item, params, parsed): @@ -100,24 +109,13 @@ def check_isc_dhcpd(item, params, parsed): yield 1, "DHCP Daemon running %d times (PIDs: %s)" % ( len(parsed["pids"]), ", ".join(map(str, parsed["pids"]))) - def ip_to_number(ip): - number = 0 - factor = 1 - for part in ip.split('.')[::-1]: - number += factor * int(part) - factor *= 256 - return number - - pool = tuple(item.split("-")) - if pool not in parsed["pools"]: + if item not in parsed["pools"]: return - range_from = ip_to_number(pool[0]) - range_to = ip_to_number(pool[1]) + range_from, range_to = parsed["pools"][item] num_leases = range_to - range_from + 1 num_used = 0 - for lease in parsed["leases"]: - lease_dec = ip_to_number(lease) + for lease_dec in parsed["leases"]: if lease_dec >= range_from and lease_dec <= range_to: num_used += 1

6 years, 8 months

Windows agent: use std::regex instead of strncmp

by Jukka Aro

Module: check_mk Branch: master Commit: 7564e43746d878661265815f4e84ddddcbc3c467 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7564e43746d878… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Jan 9 16:31:25 2018 +0100 Windows agent: use std::regex instead of strncmp Refactor and unit test from_string<globline_container>. Use std::regex_search and std::regex_replace instead of strncmp and lstrip. Change-Id: I36942a38fdae39c63668e014a02b45749a45d2e4 --- agents/windows/build_version | 2 +- agents/windows/sections/SectionLogwatch.cc | 37 ++++++++++------------ agents/windows/sections/SectionLogwatch.h | 19 ++++++++--- agents/windows/stringutil.h | 12 +++++++ .../windows/test/sections/SectionLogwatchTest.cc | 32 +++++++++++++++++-- 5 files changed, 73 insertions(+), 29 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 1a92773..5704f3f 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3048 +3050 diff --git a/agents/windows/sections/SectionLogwatch.cc b/agents/windows/sections/SectionLogwatch.cc index 9134253..257231e 100644 --- a/agents/windows/sections/SectionLogwatch.cc +++ b/agents/windows/sections/SectionLogwatch.cc @@ -64,13 +64,6 @@ inline int find_crnl_end(char *buffer) { return -1; } -inline void rtrim(std::string &s) { - s.erase(std::find_if(s.rbegin(), s.rend(), - [](int ch) { return !std::isspace(ch); }) - .base(), - s.end()); -} - file_encoding determine_encoding(const logwatch_textfile &textfile) { ifstream ifs(textfile.paths.front(), ifstream::in | ifstream::binary); @@ -762,24 +755,26 @@ globline_container from_string<globline_container>(const WinApiAdaptor &, for (; iter != end; ++iter) { std::string descriptor = iter->str(); - const char *token = lstrip(descriptor.c_str()); + ltrim(descriptor); glob_token new_token; - while (true) { - if (strncmp(token, "nocontext", 9) == 0) { - new_token.nocontext = true; - token = lstrip(token + 9); - } else if (strncmp(token, "from_start", 10) == 0) { - new_token.from_start = true; - token = lstrip(token + 10); - } else if (strncmp(token, "rotated", 7) == 0) { - new_token.rotated = true; - token = lstrip(token + 7); - } else { - break; + for (const auto &token : + std::vector<std::string>{"nocontext", "from_start", "rotated"}) { + std::regex tokenRegex("\\b" + token + "\\b"); + if (std::regex_search(descriptor, tokenRegex)) { + if (token == "nocontext") { + new_token.nocontext = true; + } else if (token == "from_start") { + new_token.from_start = true; + } else if (token == "rotated") { + new_token.rotated = true; + } + descriptor = std::regex_replace(descriptor, tokenRegex, ""); + ltrim(descriptor); } } - new_token.pattern = token; + + new_token.pattern = descriptor; tokens.push_back(new_token); } diff --git a/agents/windows/sections/SectionLogwatch.h b/agents/windows/sections/SectionLogwatch.h index 6dda17d..cadd163 100644 --- a/agents/windows/sections/SectionLogwatch.h +++ b/agents/windows/sections/SectionLogwatch.h @@ -37,10 +37,21 @@ template <> globline_container from_string<globline_container>(const WinApiAdaptor &winapi, const std::string &value); -// A bogus stream operator for globline_container just to enable template -// instantiation for ListConfigurable<GlobListT>. -inline std::ostream &operator<<(std::ostream &os, const globline_container &) { - return os << "[reference to globline_container instance]"; +inline std::ostream &operator<<(std::ostream &os, const globline_container &g) { + os << "\n[tokens]\n"; + for (const auto &token : g.tokens) { + os << "<pattern: " << token.pattern + << ", nocontext: " << std::boolalpha << token.nocontext + << ", from_start: " << token.from_start + << ", rotated: " << token.rotated + << ", found_match: " << token.found_match << ">\n"; + } + os << "[patterns]\n"; + for (const auto &pattern : g.patterns) { + os << "<state: " << pattern.state + << ", glob_pattern: " << pattern.glob_pattern << ">\n"; + } + return os; } class GlobListConfigurable diff --git a/agents/windows/stringutil.h b/agents/windows/stringutil.h index 72f21ba..6a6f0a9 100644 --- a/agents/windows/stringutil.h +++ b/agents/windows/stringutil.h @@ -44,6 +44,18 @@ const char *lstrip(const char *s); char *rstrip(char *s); char *strip(char *s); +inline void ltrim(std::string &s) { + s.erase(s.begin(), std::find_if(s.cbegin(), s.cend(), + [](int ch) { return !std::isspace(ch); })); +} + +inline void rtrim(std::string &s) { + s.erase(std::find_if(s.crbegin(), s.crend(), + [](int ch) { return !std::isspace(ch); }) + .base(), + s.end()); +} + std::vector<const char *> split_line(char *pos, int (*split_pred)(int)); char *next_word(char **line); diff --git a/agents/windows/test/sections/SectionLogwatchTest.cc b/agents/windows/test/sections/SectionLogwatchTest.cc index ce4d002..03b4f42 100644 --- a/agents/windows/test/sections/SectionLogwatchTest.cc +++ b/agents/windows/test/sections/SectionLogwatchTest.cc @@ -1,6 +1,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "sections/SectionLogwatch.h" +#include "test/MockWinApi.h" #include "types.h" using namespace ::testing; @@ -8,7 +9,7 @@ using namespace ::testing; class wa_SectionLogwatchTest : public Test {}; bool operator==(const condition_pattern &c1, const condition_pattern &c2) { - return c1.state == c2.state && c2.glob_pattern == c2.glob_pattern; + return c1.state == c2.state && c1.glob_pattern == c2.glob_pattern; } bool operator==(const logwatch_textfile &t1, const logwatch_textfile &t2) { @@ -16,8 +17,17 @@ bool operator==(const logwatch_textfile &t1, const logwatch_textfile &t2) { t1.file_id == t2.file_id && t1.file_size == t2.file_size && t1.offset == t2.offset && t1.missing == t2.missing && t1.nocontext == t2.nocontext && t1.rotated == t2.rotated && - t1.encoding == t2.encoding && - t1.patterns.get() == t2.patterns.get(); + t1.encoding == t2.encoding && t1.patterns.get() == t2.patterns.get(); +} + +bool operator==(const glob_token &t1, const glob_token &t2) { + return t1.pattern == t2.pattern && t1.nocontext == t2.nocontext && + t1.from_start == t2.from_start && t1.rotated == t2.rotated && + t1.found_match == t2.found_match; +} + +bool operator==(const globline_container &g1, const globline_container &g2) { + return g1.tokens == g2.tokens && g1.patterns == g2.patterns; } TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_valid) { @@ -73,3 +83,19 @@ TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_conversion_error) { char line[] = "M:\\log1.log|foo|bar|baz"; ASSERT_THROW(parseLogwatchStateLine(line), StateParseError); } + +TEST_F(wa_SectionLogwatchTest, from_string) { + StrictMock<MockWinApi> mockwinapi; + const std::string line = + "from_start nocontext rotated C:\\foo\\bar" + "| rotated D:\\baz\\qux*" + "|nocontext from_start rotated E:\\quux\\corge*" + "| F:\\grault\\garply"; + const globline_container expected{ + {{"C:\\foo\\bar", true, true, true, false}, + {"D:\\baz\\qux*", false, false, true, false}, + {"E:\\quux\\corge*", true, true, true, false}, + {"F:\\grault\\garply", false, false, false, false}}, + {}}; + ASSERT_EQ(expected, from_string<globline_container>(mockwinapi, line)); +}

6 years, 8 months

Windows agent: make sure eventlog name is present

by Jukka Aro

Module: check_mk Branch: master Commit: d3381cad5e060cbcb5b29e3a162b84b09d83da06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3381cad5e060c… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Jan 9 14:45:10 2018 +0100 Windows agent: make sure eventlog name is present While parsing statefile, check for missing or empty eventlog name. Change-Id: I44c8e1e86bb62b27292ad7e7c9f1e95ea1f72631 --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 4 +++- agents/windows/test/sections/SectionEventlogTest.cc | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index b2fffd3..70ca397 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3044 +3046 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index ecd6aa8..f10e7b8 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -37,7 +37,9 @@ eventlog_hint_t parseStateLine(const std::string &line) { /* Example: line = "System|1234" */ const auto tokens = tokenize(line, "\\|"); - if (tokens.size() != 2) { + if (tokens.size() != 2 || + std::any_of(tokens.cbegin(), tokens.cend(), + [](const std::string &t) { return t.empty(); })) { throw StateParseError{std::string("Invalid state line: ") + line}; } diff --git a/agents/windows/test/sections/SectionEventlogTest.cc b/agents/windows/test/sections/SectionEventlogTest.cc index 71174ed..32bbaed 100644 --- a/agents/windows/test/sections/SectionEventlogTest.cc +++ b/agents/windows/test/sections/SectionEventlogTest.cc @@ -27,6 +27,11 @@ TEST_F(wa_SectionEventlogTest, parseStateLine_Application_valid) { ASSERT_EQ(expected, parseStateLine(line)); } +TEST_F(wa_SectionEventlogTest, parseStateLine_Application_missing_name) { + char line[] = "|19881"; + ASSERT_THROW(parseStateLine(line), StateParseError); +} + TEST_F(wa_SectionEventlogTest, parseStateLine_Application_missing_value) { char line[] = "Application|"; ASSERT_THROW(parseStateLine(line), StateParseError); @@ -59,7 +64,5 @@ TEST_F(wa_SectionEventlogTest, parseStateLine_Internet_Explorer_negative) { TEST_F(wa_SectionEventlogTest, parseStateLine_Internet_Explorer_conversion_error) { char line[] = "Internet Explorer|garbage"; - const eventlog_hint_t expected{ - "Internet Explorer", std::numeric_limits<unsigned long long>::max()}; ASSERT_THROW(parseStateLine(line), StateParseError); }

6 years, 8 months

Windows agent: refactor logstate.txt read/write

by Jukka Aro

Module: check_mk Branch: master Commit: 36090b5dea9e99400bfade05f4e0ae7b74137301 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36090b5dea9e99… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Jan 9 14:48:32 2018 +0100 Windows agent: refactor logstate.txt read/write * Use std::regex / std::regex_token_iterator based tokenizer when parsing. * Cover the parsing functionality with unit tests. Change-Id: I0b553733bd520f7dbd699534e82025a31c17154d --- agents/windows/Makefile.am | 4 +- agents/windows/build_version | 2 +- agents/windows/sections/SectionLogwatch.cc | 71 ++++++++++---------- agents/windows/sections/SectionLogwatch.h | 3 +- .../windows/test/sections/SectionLogwatchTest.cc | 75 ++++++++++++++++++++++ 5 files changed, 115 insertions(+), 40 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index dd2dfca..19386e4 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -94,6 +94,7 @@ WindowsAgentTest_SOURCES = \ win_error.cc \ wmiHelper.cc \ sections/SectionEventlog.cc \ + sections/SectionLogwatch.cc \ test/EnvironmentTest.cc \ test/EventLogVistaTest.cc \ test/MockLogger.cc \ @@ -103,7 +104,8 @@ WindowsAgentTest_SOURCES = \ test/stringutilTest.cc \ test/typesTest.cc \ test/wmiHelperTest.cc \ - test/sections/SectionEventlogTest.cc + test/sections/SectionEventlogTest.cc \ + test/sections/SectionLogwatchTest.cc wmitest_SOURCES = wmitest.cc stringutil.cc WinApi.cc wmiHelper.cc diff --git a/agents/windows/build_version b/agents/windows/build_version index 70ca397..1a92773 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3046 +3048 diff --git a/agents/windows/sections/SectionLogwatch.cc b/agents/windows/sections/SectionLogwatch.cc index 0433482..9134253 100644 --- a/agents/windows/sections/SectionLogwatch.cc +++ b/agents/windows/sections/SectionLogwatch.cc @@ -124,6 +124,30 @@ void addConditionPattern(globline_container &globline, const char *state, } // namespace +logwatch_textfile parseLogwatchStateLine(const std::string &line) { + /* Example: line = "M://log1.log|98374598374|0|16"; */ + const auto tokens = tokenize(line, "\\|"); + + if (tokens.size() != 4 || + std::any_of(tokens.cbegin(), tokens.cend(), + [](const std::string &t) { return t.empty(); })) { + throw StateParseError{std::string("Invalid state line: ") + line}; + } + + try { + return {tokens[0], + std::move(std::vector<std::string>{tokens[0]}), + std::stoull(tokens[1]), + std::stoull(tokens[2]), + std::stoull(tokens[3]), + false, + false, + condition_patterns_t()}; + } catch (const std::invalid_argument &) { + throw StateParseError{std::string("Invalid state line: ") + line}; + } +} + SectionLogwatch::SectionLogwatch(Configuration &config, Logger *logger, const WinApiAdaptor &winapi) : Section("logwatch", "logfiles", config.getEnvironment(), logger, winapi) @@ -375,18 +399,16 @@ SectionLogwatch::ProcessTextfileResponse SectionLogwatch::processTextfileDefault(ifstream &file, const logwatch_textfile &textfile, std::ostream &out, bool write_output) { - char line[4096]; + std::string line; ProcessTextfileResponse response; Notice(_logger) << "Checking file " << textfile.paths.front(); - while (!file.eof()) { - if (!file.getline(line, sizeof(line))) break; - std::string lineString(line); - rtrim(lineString); + while (std::getline(file, line)) { + rtrim(line); char state = '.'; for (const auto &pattern : textfile.patterns.get()) { - if (globmatch(pattern.glob_pattern.c_str(), lineString.c_str())) { + if (globmatch(pattern.glob_pattern.c_str(), line.c_str())) { if (!write_output && (pattern.state == 'C' || pattern.state == 'W' || pattern.state == 'O')) { @@ -399,9 +421,9 @@ SectionLogwatch::processTextfileDefault(ifstream &file, } } - if (write_output && strlen(line) > 0 && + if (write_output && !line.empty() && !(textfile.nocontext && (state == 'I' || state == '.'))) - out << state << " " << lineString << "\n"; + out << state << " " << line << "\n"; } response.found_match = false; @@ -705,39 +727,14 @@ logwatch_textfile &SectionLogwatch::addNewRotatedLogfile( return _textfiles.back(); } -void SectionLogwatch::parseLogwatchStateLine(char *line) { - /* Example: line = "M://log1.log|98374598374|0|16"; */ - rstrip(line); - char *p = line; - while (*p && *p != '|') p++; - *p = 0; - char *path = line; - p++; - - char *token = strtok(p, "|"); - if (!token) return; // Ignore invalid lines - unsigned long long file_id = std::strtoull(token, NULL, 10); - - token = strtok(NULL, "|"); - if (!token) return; - unsigned long long file_size = std::strtoull(token, NULL, 10); - - token = strtok(NULL, "|"); - if (!token) return; - unsigned long long offset = std::strtoull(token, NULL, 10); - - _hints.emplace_back(path, std::move(std::vector<std::string>{path}), - file_id, file_size, offset, false, false, - condition_patterns_t()); -} - void SectionLogwatch::loadLogwatchOffsets() { if (!_offsets_loaded) { ifstream ifs(_env.logwatchStatefile()); if (ifs) { - char line[256]; - while (ifs.getline(line, sizeof(line))) { - parseLogwatchStateLine(line); + std::string line; + while (std::getline(ifs, line)) { + rtrim(line); + _hints.push_back(parseLogwatchStateLine(line)); } } _offsets_loaded = true; diff --git a/agents/windows/sections/SectionLogwatch.h b/agents/windows/sections/SectionLogwatch.h index 831b06c..6dda17d 100644 --- a/agents/windows/sections/SectionLogwatch.h +++ b/agents/windows/sections/SectionLogwatch.h @@ -70,6 +70,8 @@ public: } }; +logwatch_textfile parseLogwatchStateLine(const std::string &line); + class SectionLogwatch : public Section { struct ProcessTextfileResponse { bool found_match; @@ -95,7 +97,6 @@ private: void cleanupTextfiles(); void loadLogwatchOffsets(); - void parseLogwatchStateLine(char *line); bool getFileInformation(const std::string &filename, BY_HANDLE_FILE_INFORMATION *info); diff --git a/agents/windows/test/sections/SectionLogwatchTest.cc b/agents/windows/test/sections/SectionLogwatchTest.cc new file mode 100644 index 0000000..ce4d002 --- /dev/null +++ b/agents/windows/test/sections/SectionLogwatchTest.cc @@ -0,0 +1,75 @@ +#include "gmock/gmock.h" +#include "gtest/gtest.h" +#include "sections/SectionLogwatch.h" +#include "types.h" + +using namespace ::testing; + +class wa_SectionLogwatchTest : public Test {}; + +bool operator==(const condition_pattern &c1, const condition_pattern &c2) { + return c1.state == c2.state && c2.glob_pattern == c2.glob_pattern; +} + +bool operator==(const logwatch_textfile &t1, const logwatch_textfile &t2) { + return t1.name == t2.name && t1.paths == t2.paths && + t1.file_id == t2.file_id && t1.file_size == t2.file_size && + t1.offset == t2.offset && t1.missing == t2.missing && + t1.nocontext == t2.nocontext && t1.rotated == t2.rotated && + t1.encoding == t2.encoding && + t1.patterns.get() == t2.patterns.get(); +} + +TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_valid) { + char line[] = "M:\\log1.log|98374598374|0|16"; + const logwatch_textfile expected{"M:\\log1.log", + std::vector<std::string>{"M:\\log1.log"}, + 98374598374, + 0, + 16, + false, + false, + condition_patterns_t()}; + ASSERT_EQ(expected, parseLogwatchStateLine(line)); +} + +TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_missing_offset) { + char line[] = "M:\\log1.log|98374598374|0|"; + ASSERT_THROW(parseLogwatchStateLine(line), StateParseError); +} + +TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_missing_file_size) { + char line[] = "M:\\log1.log|98374598374|"; + ASSERT_THROW(parseLogwatchStateLine(line), StateParseError); +} + +TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_missing_file_id) { + char line[] = "M:\\log1.log|"; + ASSERT_THROW(parseLogwatchStateLine(line), StateParseError); +} + +TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_missing_path) { + char line[] = "|98374598374|0|16"; + ASSERT_THROW(parseLogwatchStateLine(line), StateParseError); +} + +TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_invalid_separator) { + char line[] = "M:\\log1.log§98374598374§0§16"; + ASSERT_THROW(parseLogwatchStateLine(line), StateParseError); +} + +TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_negative) { + char line[] = "M:\\log1.log|-1|-1|-1"; + const auto maxValue = std::numeric_limits<unsigned long long>::max(); + const logwatch_textfile expected{ + "M:\\log1.log", std::vector<std::string>{"M:\\log1.log"}, + maxValue, maxValue, + maxValue, false, + false, condition_patterns_t()}; + ASSERT_EQ(expected, parseLogwatchStateLine(line)); +} + +TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_conversion_error) { + char line[] = "M:\\log1.log|foo|bar|baz"; + ASSERT_THROW(parseLogwatchStateLine(line), StateParseError); +}

6 years, 8 months

5629 Vertical axis width can now be set to a custom width

by Lars Michelsen

Module: check_mk Branch: master Commit: d536ef6a9e3634fb3f68c0c459a11a79718c4210 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d536ef6a9e3634… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 9 16:21:42 2018 +0100 5629 Vertical axis width can now be set to a custom width You can now configure a new render option "vertical axis width" to override the default vertical axis width with a custom fixed width. Change-Id: I861380a926235f69c5f8d084f2deb3baa94fc953 --- .werks/5629 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5629 b/.werks/5629 new file mode 100644 index 0000000..455a835 --- /dev/null +++ b/.werks/5629 @@ -0,0 +1,12 @@ +Title: Vertical axis width can now be set to a custom width +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1515511202 +Class: feature + +You can now configure a new render option "vertical axis width" +to override the default vertical axis width with a custom fixed +width.

6 years, 8 months

5628 FIX Reduced default vertical axis width to previous width

by Lars Michelsen

Module: check_mk Branch: master Commit: e9fc18488affc54159321b7cf9d987952d1abae6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9fc18488affc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 9 15:46:05 2018 +0100 5628 FIX Reduced default vertical axis width to previous width In 1.5.0i2 the vertical axis width was increased a bit by accident. This has now been reduced again to the intended width Change-Id: I16c54d87a0d6a7cb55ea60e89f1c735dae4ab7ac --- .werks/5628 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5628 b/.werks/5628 new file mode 100644 index 0000000..6bc9546 --- /dev/null +++ b/.werks/5628 @@ -0,0 +1,11 @@ +Title: Reduced default vertical axis width to previous width +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1515509073 +Class: fix + +In 1.5.0i2 the vertical axis width was increased a bit by accident. +This has now been reduced again to the intended width

6 years, 8 months

5596 FIX Fixed exception when editing "Metrics graph of a single service" reportlets

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f2a6cd8da2b05ca29eab3c7179f462fb76691d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f2a6cd8da2b05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 9 14:41:14 2018 +0100 5596 FIX Fixed exception when editing "Metrics graph of a single service" reportlets Fixed an error related to the background_color attribute when trying to edit a single metric reportlet. This issue was introduced with 1.5.0i2. Change-Id: Iaaf20d465ed6c24f577b45575c110287dcb391b5 --- .werks/5596 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5596 b/.werks/5596 new file mode 100644 index 0000000..ff0ee51 --- /dev/null +++ b/.werks/5596 @@ -0,0 +1,11 @@ +Title: Fixed exception when editing "Metrics graph of a single service" reportlets +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1515505202 +Class: fix + +Fixed an error related to the background_color attribute when trying to edit +a single metric reportlet. This issue was introduced with 1.5.0i2.

6 years, 8 months

5597 FIX Fixed incorrect handling of configurable graph font sizes ( since 1.5.0i2)

by Lars Michelsen

Module: check_mk Branch: master Commit: 7698e1432bd3837151ef9bb42de8b5fe1dd849d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7698e1432bd383… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 9 15:41:30 2018 +0100 5597 FIX Fixed incorrect handling of configurable graph font sizes (since 1.5.0i2) The font size is configured as PT (points) but was interpreted as PX (pixels) when rendering in the GUI. This has now been fixed to be interpreted as PT in all places. Change-Id: If14aa4532c6dacfa825144f67591dca24d622e6d --- .werks/5597 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5597 b/.werks/5597 new file mode 100644 index 0000000..eb33349 --- /dev/null +++ b/.werks/5597 @@ -0,0 +1,12 @@ +Title: Fixed incorrect handling of configurable graph font sizes (since 1.5.0i2) +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1515508805 +Class: fix + +The font size is configured as PT (points) but was interpreted as PX (pixels) +when rendering in the GUI. This has now been fixed to be interpreted as PT +in all places.

6 years, 8 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 9c87ca330d61276faa6c605df43a20af11cffc6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c87ca330d6127… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 9 15:44:20 2018 +0100 Reserved 20 Werk IDS Change-Id: Ib808119b9207578160ec4d5dfd4a2f9229598637 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 142e175..ce09e20 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5628 +5648

6 years, 8 months

Simplified initial logging of downtimes.

by Sven Panne

Module: check_mk Branch: master Commit: a7e01e52e081f4013b2b9a353f1cab254c03a9e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7e01e52e081f4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 9 13:20:08 2018 +0100 Simplified initial logging of downtimes. Change-Id: I0c9539ac227673a16dcadab78641d4bf26612e06 --- livestatus/src/module.cc | 50 +++++++++++------------------------------------- 1 file changed, 11 insertions(+), 39 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 2634abf..5bac8be 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -132,7 +132,6 @@ TimeperiodsCache *g_timeperiods_cache = nullptr; /* simple statistics data for TableStatus */ extern host *host_list; extern service *service_list; -extern scheduled_downtime *scheduled_downtime_list; extern int log_initial_states; int g_num_hosts; @@ -516,51 +515,24 @@ int broker_program(int event_type __attribute__((__unused__)), return 0; } -// TODO(sp) This looks a bit obscure: We do not check if the downtime is active -// and if it is the right downtime. Furthermore, we only retrieve and log one -// downtime, even if the current object is in several downtimes at once. -const char *get_downtime_comment(char *host_name, char *svc_desc) { - char *comment; - int matches = 0; - for (scheduled_downtime *dt_list = scheduled_downtime_list; - dt_list != nullptr; dt_list = dt_list->next) { - if (dt_list->type == HOST_DOWNTIME) { - if (strcmp(dt_list->host_name, host_name) == 0) { - matches++; - comment = dt_list->comment; - } - } - if (svc_desc != nullptr && dt_list->type == SERVICE_DOWNTIME) { - if (strcmp(dt_list->host_name, host_name) == 0 && - strcmp(dt_list->service_description, svc_desc) == 0) { - matches++; - comment = dt_list->comment; - } - } - } - return matches == 0 ? "No comment" - : matches > 1 ? "Multiple Downtime Comments" : comment; -} - void livestatus_log_initial_states() { - // Log DOWNTIME hosts - for (host *h = host_list; h != nullptr; h = h->next) { - if (h->scheduled_downtime_depth > 0) { + extern scheduled_downtime *scheduled_downtime_list; + // It's a bit unclear if we need to log downtimes of hosts *before* their + // corresponding service downtimes, so let's play safe... + for (auto dt = scheduled_downtime_list; dt != nullptr; dt = dt->next) { + if (dt->is_in_effect != 0 && dt->type == HOST_DOWNTIME) { Informational(fl_logger_nagios) - << "HOST DOWNTIME ALERT: " << h->name << ";STARTED;" - << get_downtime_comment(h->name, nullptr); + << "HOST DOWNTIME ALERT: " << dt->host_name << ";STARTED;" + << dt->comment; } } - // Log DOWNTIME services - for (service *s = service_list; s != nullptr; s = s->next) { - if (s->scheduled_downtime_depth > 0) { + for (auto dt = scheduled_downtime_list; dt != nullptr; dt = dt->next) { + if (dt->is_in_effect != 0 && dt->type == SERVICE_DOWNTIME) { Informational(fl_logger_nagios) - << "SERVICE DOWNTIME ALERT: " << s->host_name << ";" - << s->description << ";STARTED;" - << get_downtime_comment(s->host_name, s->description); + << "SERVICE DOWNTIME ALERT: " << dt->host_name << ";" + << dt->service_description << ";STARTED;" << dt->comment; } } - // Log TIMERPERIODS g_timeperiods_cache->logCurrentTimeperiods(); }

6 years, 8 months

← Newer
1
...
19
20
21
22
23
24
25
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018