Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

No need to modify a log line during parsing.

by Sven Panne

Module: check_mk Branch: master Commit: 91b46126bf7f0e521738042b129e27dc72c38097 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91b46126bf7f0e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 2 08:22:52 2017 +0200 No need to modify a log line during parsing. Change-Id: Id12240802f830eb593f604a0c3105ccb917da42c --- livestatus/src/LogEntry.cc | 10 +--------- livestatus/src/LogEntry.h | 2 +- livestatus/src/Logfile.cc | 12 ++++++++++-- livestatus/src/Logfile.h | 3 +-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 3b4d84d..a4624f1 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -24,7 +24,6 @@ #include "LogEntry.h" #include <cstdlib> -#include <cstring> #include <stdexcept> #include <unordered_map> #include <utility> @@ -35,7 +34,7 @@ using mk::starts_with; using std::string; using std::unordered_map; -LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, char *line) { +LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, const char *line) { // TODO(sp) Fix classifyLogMessage() below to always set all fields and // remove this set-me-to-zero-to-be-sure-block. _state = 0; @@ -44,13 +43,6 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, char *line) { _service = nullptr; _contact = nullptr; _lineno = lineno; - - // make a copy of the message and strip trailing newline - size_t linelen = strlen(line); - while (linelen > 0 && line[linelen - 1] == '\n') { - line[--linelen] = '\0'; - } - _complete = line; // pointer to options (everything after ':') diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index 473d993..24771a7 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -99,7 +99,7 @@ public: Command _command; // NOTE: line gets modified! - LogEntry(MonitoringCore *mc, unsigned lineno, char *line); + LogEntry(MonitoringCore *mc, unsigned lineno, const char *line); unsigned updateReferences(MonitoringCore *mc); static ServiceState parseServiceState(const std::string &str); static HostState parseHostState(const std::string &str); diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 8b228ed..66a596e 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -158,6 +158,7 @@ void Logfile::load(LogCache *logcache, time_t since, time_t until, void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, time_t since, time_t until, unsigned logclasses) { vector<char> linebuffer(65536); + // TODO(sp) We should really use C++ I/O here... while (fgets(&linebuffer[0], linebuffer.size(), file) != nullptr) { if (_lineno >= _mc->maxLinesPerLogFile()) { Error(logger()) << "more than " << _mc->maxLinesPerLogFile() @@ -165,6 +166,13 @@ void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, return; } _lineno++; + // remove trailing newline (should be nuked, see above) + for (auto &ch : linebuffer) { + if (ch == '\0' || ch == '\n') { + ch = '\0'; + break; + } + } if (processLogLine(_lineno, &linebuffer[0], missing_types)) { logcache->handleNewMessage(this, since, until, logclasses); // memory management @@ -192,9 +200,9 @@ long Logfile::freeMessages(unsigned logclasses) { return freed; } -bool Logfile::processLogLine(uint32_t lineno, char *linebuffer, +bool Logfile::processLogLine(uint32_t lineno, const char *line, unsigned logclasses) { - auto entry = make_unique<LogEntry>(_mc, lineno, linebuffer); + auto entry = make_unique<LogEntry>(_mc, lineno, line); // ignored invalid lines if (entry->_logclass == LogEntry::Class::invalid) { return false; diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 9ffd68b..0b1567d 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -93,8 +93,7 @@ public: private: void loadRange(FILE *file, unsigned missing_types, LogCache *, time_t since, time_t until, unsigned logclasses); - // NOTE: linebuffer gets modified! - bool processLogLine(uint32_t, char *linebuffer, unsigned); + bool processLogLine(uint32_t lineno, const char *line, unsigned logclasses); uint64_t makeKey(time_t, unsigned); Logger *logger() const; };

7 years, 2 months

Parse timestamp without modifying underlying string.

by Sven Panne

Module: check_mk Branch: master Commit: 3ba9ec9e68e1791048cc5319cc4b397718980673 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ba9ec9e68e179… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 2 08:11:38 2017 +0200 Parse timestamp without modifying underlying string. Change-Id: I9a9ca4b55004d25756cce3cf9959aca9bbff5162 --- livestatus/src/LogEntry.cc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 4201aa4..3b4d84d 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -25,6 +25,7 @@ #include "LogEntry.h" #include <cstdlib> #include <cstring> +#include <stdexcept> #include <unordered_map> #include <utility> #include "MonitoringCore.h" @@ -50,8 +51,6 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, char *line) { line[--linelen] = '\0'; } - // keep unsplit copy of the message (needs lots of memory, maybe we could - // optimize that one day...) _complete = line; // pointer to options (everything after ':') @@ -64,17 +63,22 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, char *line) { } _options = &_complete[pos]; - // [1260722267] xxx - extract timestamp, validate message - if (linelen < 13 || line[0] != '[' || line[11] != ']') { + // 0123456789012345678901234567890 + // [1234567890] FOO BAR: blah blah + constexpr size_t timestamp_prefix_length = 13; + try { + if (_complete.size() < timestamp_prefix_length || _complete[0] != '[' || + _complete[11] != ']' || _complete[12] != ' ') { + throw std::invalid_argument("timestamp delimiter"); + } + _time = std::stoi(_complete.substr(1, 10)); + } catch (const std::logic_error &e) { _logclass = Class::invalid; _type = LogEntryType::none; return; // ignore invalid lines silently } - line[11] = 0; // zero-terminate time stamp - _time = atoi(line + 1); - // also skip space after timestamp - classifyLogMessage(line + 13); + classifyLogMessage(line + timestamp_prefix_length); applyWorkarounds(); updateReferences(mc); }

7 years, 2 months

Use std::string a bit more often.

by Sven Panne

Module: check_mk Branch: master Commit: f9617844e236210ca0b6fa46aa2e17e4bcb6fe0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9617844e23621… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 1 13:39:22 2017 +0200 Use std::string a bit more often. This is just an intermediate step to get rid of strdup/free. Change-Id: I57e7aa38a4aba077edf90e86bb6551833aec38d7 --- livestatus/src/LogEntry.cc | 50 ++++++++++++++++--------------------- livestatus/src/LogEntry.h | 22 ++++++++-------- livestatus/src/TableLog.cc | 14 +++++------ livestatus/src/TableStateHistory.cc | 21 +++++++--------- 4 files changed, 49 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f9617844e2…

7 years, 2 months

Simplify ownership, killing a strdup/free pair.

by Sven Panne

Module: check_mk Branch: master Commit: fc3b0165cf800b3782c00d1458f1e02c0583f69a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc3b0165cf800b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 1 16:47:46 2017 +0200 Simplify ownership, killing a strdup/free pair. This basically swaps the roles of LogEntry::_msg and LogEntry::_text. The former is now just a local variable, and it will die soon. Change-Id: I559dd3569a37a6251cf5f47ea63db2e30f1b0f64 --- livestatus/src/LogEntry.cc | 100 ++++++++++++++++++++++----------------------- livestatus/src/LogEntry.h | 9 ++-- livestatus/src/Logfile.cc | 2 +- livestatus/src/Logfile.h | 3 +- livestatus/src/TableLog.cc | 2 +- 5 files changed, 56 insertions(+), 60 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fc3b0165cf…

7 years, 2 months

4987 FIX oracle_instance: Removed uptime from inventory plugin in sense of werk #4485

by Simon Betz

Module: check_mk Branch: master Commit: 7ea230be8e26c00e8d864e188ed7bd10d5b3670d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ea230be8e26c0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 1 14:39:49 2017 +0200 4987 FIX oracle_instance: Removed uptime from inventory plugin in sense of werk #4485 Change-Id: Ie7665c0ce050c0ebd043a863437aa32fadfebc4f --- .werks/4987 | 11 +++++++++++ inventory/oracle_instance | 1 - web/plugins/views/inventory.py | 3 +-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/4987 b/.werks/4987 new file mode 100644 index 0000000..e624382 --- /dev/null +++ b/.werks/4987 @@ -0,0 +1,11 @@ +Title: oracle_instance: Removed uptime from inventory plugin in sense of werk #4485 +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1501591071 + + diff --git a/inventory/oracle_instance b/inventory/oracle_instance index 555f387..4cdf041 100644 --- a/inventory/oracle_instance +++ b/inventory/oracle_instance @@ -55,7 +55,6 @@ def inv_oracle_instance(info): "openmode" : openmode, "logmode" : logmode, "logins" : logins, - "db_uptime" : up_seconds, "db_creation_time" : db_creation_time, }) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 8ecd1d4..b6c50bf 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -814,14 +814,13 @@ inventory_displayhints.update({ ".software.applications.oracle.instance:" : { "title" : _("Instances"), "render" : render_inv_dicttable, "keyorder" : [ "sid", "version", "openmode", "logmode", - "logins", "db_uptime", "db_creation_time" ], + "logins", "db_creation_time" ], "view" : "invorainstance_of_host" }, ".software.applications.oracle.instance:*.sid" : { "title" : _("SID"), }, ".software.applications.oracle.instance:*.version" : { "title" : _("Version"), }, ".software.applications.oracle.instance:*.openmode" : { "title" : _("Open mode"), }, ".software.applications.oracle.instance:*.logmode" : { "title" : _("Log mode"), }, ".software.applications.oracle.instance:*.logins" : { "title" : _("Logins"), }, - ".software.applications.oracle.instance:*.db_uptime" : { "title" : _("Uptime"), "paint" : "age" }, ".software.applications.oracle.instance:*.db_creation_time" : { "title" : _("Creation time"), "paint" : "date_and_time" }, ".software.applications.oracle.dataguard_stats:" : { "title" : _("Dataguard statistics"),

7 years, 2 months

4854 FIX WATO Web-API: The liveproxyd configuration was not correctly updated when a site got configured

by Andreas Boesl

Module: check_mk Branch: master Commit: 8c49554022cb623fdf9616347b4851fe31be86b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c49554022cb62… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 1 13:27:27 2017 +0200 4854 FIX WATO Web-API: The liveproxyd configuration was not correctly updated when a site got configured This caused strange side effects, whereas a site was correctly configured in the distributed monitoring page, but always considered <i>dead</i> from the liveproxyd's perspective. Change-Id: Ic70cbf6488cfc002a18fff84b752bf04ca70de54 --- .werks/4854 | 12 ++++ web/htdocs/webapi.py | 11 ++-- web/plugins/webapi/webapi.py | 132 +++++++++++++++++++++---------------------- 3 files changed, 84 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8c49554022…

7 years, 2 months

LogEntry::assign(): Do only *one* thing

by Sven Panne

Module: check_mk Branch: master Commit: 2f9e3b469e314cb1269a370d9eb30bea74a7a828 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f9e3b469e314c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 1 12:30:27 2017 +0200 LogEntry::assign(): Do only *one* thing Functions should do one thing. They should do it well. They should do it only. See: https://sites.google.com/site/unclebobconsultingllc/one-thing-extract-till-… We had to const-correct a few fields on the way, which is a good thing, too. Change-Id: I7adba26d364525a001482961783c717acb7b6494 --- livestatus/src/LogEntry.cc | 39 +++++++++++++++++++++------------------ livestatus/src/LogEntry.h | 18 +++++++++--------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 7be2ce9..08ac1ea 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -92,43 +92,42 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, const char *line) { LogEntry::~LogEntry() { free(_msg); } -bool LogEntry::assign(Param par, char **scan) { +bool LogEntry::assign(Param par, const char *field) { switch (par) { case Param::HostName: - this->_host_name = next_token(scan, ';'); + this->_host_name = field; break; case Param::SvcDesc: - this->_svc_desc = next_token(scan, ';'); + this->_svc_desc = field; break; case Param::HostState: this->_state = - static_cast<int>(parseHostState(safe_next_token(scan, ';'))); + static_cast<int>(parseHostState(field == nullptr ? "" : field)); break; case Param::ServiceState: - this->_state = - static_cast<int>(parseServiceState(safe_next_token(scan, ';'))); + this->_state = static_cast<int>( + parseServiceState(field == nullptr ? "" : field)); break; case Param::State: - // numeric state - this->_state = atoi(safe_next_token(scan, ';')); + this->_state = field == nullptr ? 0 : atoi(field); break; case Param::StateType: - this->_state_type = next_token(scan, ';'); + this->_state_type = field; break; case Param::Attempt: - this->_attempt = atoi(safe_next_token(scan, ';')); + this->_attempt = field == nullptr ? 0 : atoi(field); break; case Param::Comment: - this->_comment = next_token(scan, ';'); + this->_comment = field; break; case Param::CommandName: - this->_command_name = next_token(scan, ';'); + this->_command_name = field; break; case Param::ContactName: - this->_contact_name = next_token(scan, ';'); + this->_contact_name = field; break; case Param::CheckOutput: - this->_check_output = next_token(scan, ';'); + this->_check_output = field; break; } @@ -294,7 +293,7 @@ void LogEntry::classifyLogMessage() { _text = next_token(&scan, ':'); ++scan; for (Param par : def.params) { - assign(par, &scan); + assign(par, next_token(&scan, ';')); } return; } @@ -409,15 +408,19 @@ HostState LogEntry::parseHostState(const string &str) { unsigned LogEntry::updateReferences(MonitoringCore *mc) { unsigned updated = 0; if (_host_name != nullptr) { - _host = find_host(_host_name); + // Older Nagios headers are not const-correct... :-P + _host = find_host(const_cast<char *>(_host_name)); updated++; } if (_svc_desc != nullptr) { - _service = find_service(_host_name, _svc_desc); + // Older Nagios headers are not const-correct... :-P + _service = find_service(const_cast<char *>(_host_name), + const_cast<char *>(_svc_desc)); updated++; } if (_contact_name != nullptr) { - _contact = find_contact(_contact_name); + // Older Nagios headers are not const-correct... :-P + _contact = find_contact(const_cast<char *>(_contact_name)); updated++; } if (_command_name != nullptr) { diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index 7d975c6..213d77d 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -80,18 +80,18 @@ public: time_t _time; Class _logclass; LogEntryType _type; - std::string _complete; // copy of complete unsplit message - const char *_options; // points into _complete after ':' - char *_text; // points into msg - char *_host_name; // points into msg or is 0 - char *_svc_desc; // points into msg or is 0 + std::string _complete; // copy of complete unsplit message + const char *_options; // points into _complete after ':' + char *_text; // points into msg + const char *_host_name; // points into msg or is 0 + const char *_svc_desc; // points into msg or is 0 const char *_command_name; - char *_contact_name; + const char *_contact_name; int _state; const char *_state_type; int _attempt; - char *_check_output; - char *_comment; + const char *_check_output; + const char *_comment; host *_host; service *_service; @@ -129,7 +129,7 @@ private: char *_msg; // split up with binary zeroes static std::vector<LogDef> log_definitions; - bool assign(Param par, char **scan); + bool assign(Param par, const char *field); void applyWorkarounds(); void classifyLogMessage(); };

7 years, 2 months

Simplification: Merge functions and use C++ strings instead of pointer arcana.

by Sven Panne

Module: check_mk Branch: master Commit: d4786299402d94340aef0dd32ff8f08d09d6f6eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4786299402d94… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 1 10:53:50 2017 +0200 Simplification: Merge functions and use C++ strings instead of pointer arcana. Change-Id: I3409e8af9fcaece7ada703e9a4c5c7861ef19e7b --- livestatus/src/LogEntry.cc | 90 +++++++++++++++++++++------------------------- livestatus/src/LogEntry.h | 3 +- 2 files changed, 41 insertions(+), 52 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index d4156ba..7be2ce9 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -36,10 +36,9 @@ using mk::starts_with; using std::string; using std::unordered_map; -LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, const char *line) - : _logclass(Class::info), _type(LogEntryType::none) { - // TODO(sp) Fix all handleFooEntry() member functions below to always set - // all fields and remove this set-me-to-zero-to-be-sure-block. +LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, const char *line) { + // TODO(sp) Fix classifyLogMessage() below to always set all fields and + // remove this set-me-to-zero-to-be-sure-block. _host_name = nullptr; _svc_desc = nullptr; _command_name = nullptr; @@ -79,18 +78,16 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, const char *line) // [1260722267] xxx - extract timestamp, validate message if (msglen < 13 || _msg[0] != '[' || _msg[11] != ']') { _logclass = Class::invalid; + _type = LogEntryType::none; return; // ignore invalid lines silently } _msg[11] = 0; // zero-terminate time stamp _time = atoi(_msg + 1); _text = _msg + 13; // also skip space after timestamp - if (classifyLogMessage()) { - updateReferences(mc); - } else { - handleEntry(); - } - // rest is Class::INFO + classifyLogMessage(); + applyWorkarounds(); + updateReferences(mc); } LogEntry::~LogEntry() { free(_msg); } @@ -287,7 +284,7 @@ std::vector<LogEntry::LogDef> LogEntry::log_definitions // NOLINT //////////////// LogDef{"EXTERNAL COMMAND: ", Class::ext_command, LogEntryType::none, {}}}; -bool LogEntry::classifyLogMessage() { +void LogEntry::classifyLogMessage() { string text = _text; for (const auto &def : log_definitions) { if (starts_with(text, def.prefix)) { @@ -296,18 +293,43 @@ bool LogEntry::classifyLogMessage() { char *scan = _text; _text = next_token(&scan, ':'); ++scan; - for (Param par : def.params) { assign(par, &scan); } - - applyWorkarounds(); - - return true; + return; } } - - return false; + if (starts_with(text, "LOG VERSION: 2.0")) { + _logclass = Class::program; + _type = LogEntryType::log_version; + return; + } + if (starts_with(text, "logging initial states") || + starts_with(text, "logging intitial states")) { + _logclass = Class::program; + _type = LogEntryType::log_initial_states; + return; + } + if (text.find("starting...") != string::npos || + text.find("active mode...") != string::npos) { + _logclass = Class::program; + _type = LogEntryType::core_starting; + return; + } + if (text.find("shutting down...") != string::npos || + text.find("Bailing out") != string::npos || + text.find("standby mode...") != string::npos) { + _logclass = Class::program; + _type = LogEntryType::core_stopping; + return; + } + if (text.find("restarting...") != string::npos) { + _logclass = Class::program; + _type = LogEntryType::none; + return; + } + _logclass = Class::info; + _type = LogEntryType::none; } // The NotifyHelper class has a long, tragic history: Through a long series of @@ -337,38 +359,6 @@ void LogEntry::applyWorkarounds() { : static_cast<int>(parseServiceState(_state_type)); } -void LogEntry::handleEntry() { - if (strncmp(_text, "LOG VERSION: 2.0", 16) == 0) { - _logclass = Class::program; - _type = LogEntryType::log_version; - return; - } - if (strncmp(_text, "logging initial states", 22) == 0 || - strncmp(_text, "logging intitial states", 23) == 0) { - _logclass = Class::program; - _type = LogEntryType::log_initial_states; - return; - } - if (strstr(_text, "starting...") != nullptr || - strstr(_text, "active mode...") != nullptr) { - _logclass = Class::program; - _type = LogEntryType::core_starting; - return; - } - if (strstr(_text, "shutting down...") != nullptr || - strstr(_text, "Bailing out") != nullptr || - strstr(_text, "standby mode...") != nullptr) { - _logclass = Class::program; - _type = LogEntryType::core_stopping; - return; - } - if (strstr(_text, "restarting...") != nullptr) { - _logclass = Class::program; - _type = LogEntryType::none; - return; - } -} - namespace { // Ugly: Depending on where we're called, the actual state type can be in // parentheses at the end, e.g. "ALERTHANDLER (OK)". diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index ca9fabd..7d975c6 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -131,8 +131,7 @@ private: bool assign(Param par, char **scan); void applyWorkarounds(); - bool classifyLogMessage(); - void handleEntry(); + void classifyLogMessage(); }; #endif // LogEntry_h

7 years, 2 months

5023 FIX Fixed parsing of monitoring history.

by Sven Panne

Module: check_mk Branch: master Commit: 61e76b2ef61237b0b910f4dec5985c693e40ccfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61e76b2ef61237… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 1 10:39:45 2017 +0200 5023 FIX Fixed parsing of monitoring history. A few kind of lines in the monitoring history were not correctly parsed, including core start/stops. This could lead e.g. to incorrect availibility calculations later. This has been fixed. Change-Id: I76e79f1835728932ac67aa6987b4bcd7a89278b2 --- .werks/5023 | 12 ++++++++++++ livestatus/src/LogEntry.cc | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5023 b/.werks/5023 new file mode 100644 index 0000000..b1ecba1 --- /dev/null +++ b/.werks/5023 @@ -0,0 +1,12 @@ +Title: Fixed parsing of monitoring history. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1501576667 +Class: fix + +A few kind of lines in the monitoring history were not correctly parsed, +including core start/stops. This could lead e.g. to incorrect availibility +calculations later. This has been fixed. diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index f3a2fb2..d4156ba 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -307,7 +307,7 @@ bool LogEntry::classifyLogMessage() { } } - return true; + return false; } // The NotifyHelper class has a long, tragic history: Through a long series of

7 years, 2 months

4803 Always display agent version and OS in Check_MK service if available

by Konstantin Büttner

Module: check_mk Branch: master Commit: c56e4091b8c0a10989ade76902f777860dc2e519 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c56e4091b8c0a1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Aug 1 10:04:36 2017 +0200 4803 Always display agent version and OS in Check_MK service if available Change-Id: I09cd790e5fe4da467151a6332f1e2d762f97a22b --- .werks/4803 | 10 ++++++++++ cmk_base/checking.py | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/4803 b/.werks/4803 new file mode 100644 index 0000000..1c41206 --- /dev/null +++ b/.werks/4803 @@ -0,0 +1,10 @@ +Title: Always display agent version and OS in Check_MK service if available +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1501574646 +Class: feature + + diff --git a/cmk_base/checking.py b/cmk_base/checking.py index d45a60d..c8c4196 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -90,6 +90,7 @@ def do_check(hostname, ipaddress, only_check_types = None): do_all_checks_on_host(hostname, ipaddress, only_check_types) agent_version = cmk_info["version"] + agent_os = cmk_info.get("agentos") num_errors = len(error_sections) @@ -137,10 +138,13 @@ def do_check(hostname, ipaddress, only_check_types = None): else: output = "" - if not config.is_cluster(hostname) and agent_version != None: - output += "Agent version %s, " % agent_version status = 0 + if not config.is_cluster(hostname) and agent_version != None: + output += "Agent version %s, " % agent_version + if not config.is_cluster(hostname) and agent_os != None: + output += "Agent OS %s, " % agent_os + except MKTimeout: raise

7 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017