Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 6c49ec2e8ffd45ca6d3445db6f5d98fd98dff9ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c49ec2e8ffd45… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 2 15:21:06 2017 +0200 No need to check for strdup() anymore. Victory! :-) The Micro Core and then Livestatus NEB do not use strdup() nor malloc() nor free() anymore, which is a very good thing. We should really keep it that way. The only exception: backtrace() and rrd_xport() return malloc()'d stuff, so we have no choice there. Next stop: Nuke new/delete and use RAII/smart pointers instead. Change-Id: Id5d33d2d1674c7c86bcf1e722b298100e846f7a5 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a566a81..d00f144 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,7 @@ AC_TYPE_UINT64_T AC_FUNC_SELECT_ARGTYPES AC_TYPE_SIGNAL AC_FUNC_STAT -AC_CHECK_FUNCS([memmove select socket strcasecmp strdup strerror strtoul]) +AC_CHECK_FUNCS([memmove select socket strcasecmp strerror strtoul]) AC_ARG_WITH(nagios4,AC_HELP_STRING([--with-nagios4],[enabled compilation for nagios 4]), [ CPPFLAGS="${CFLAGS} -DNAGIOS4"

7 years, 2 months

Removed yet another strdup(), fixing a space leak on the way.

by Sven Panne

Module: check_mk Branch: master Commit: ad42e4cf5ac480b507a85781f8e658167508dfad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad42e4cf5ac480… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 2 15:17:28 2017 +0200 Removed yet another strdup(), fixing a space leak on the way. Change-Id: I2c490c02e4772a923880d3a900a7845439b7adf7 --- livestatus/src/module.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 6d9a179..2aea007 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -22,7 +22,7 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// Needed for strdup and S_ISSOCK +// Needed for S_ISSOCK #define _XOPEN_SOURCE 500 // https://github.com/include-what-you-use/include-what-you-use/issues/166 @@ -909,7 +909,9 @@ void livestatus_parse_arguments(const char *args_orig) { return; // no arguments, use default options } - char *args = strdup(args_orig); + // TODO(sp) Nuke next_field and friends. Use C++ strings everywhere. + vector<char> args_buf(args_orig, args_orig + strlen(args_orig) + 1); + char *args = &args_buf[0]; while (char *token = next_field(&args)) { /* find = */ char *part = token; @@ -1078,8 +1080,6 @@ void livestatus_parse_arguments(const char *args_orig) { Warning(fl_logger_nagios) << "fl_socket_path=[" << fl_socket_path << "], fl_mkeventd_socket_path=[" << fl_mkeventd_socket_path << "]"; - - // free(args); won't free, since we use pointers? } void omd_advertize() {

7 years, 2 months

Avoid unnecessary string copies.

by Sven Panne

Module: check_mk Branch: master Commit: 91bc9c0be96eb1137f6bde204edc57adb532e538 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91bc9c0be96eb1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 2 14:13:19 2017 +0200 Avoid unnecessary string copies. The code is a bit more verbose than usual, but parsing the monitoring history is a bit performance-sensitive. Change-Id: I8498651adade98174d81ec011327dc11a449a6c2 --- livestatus/src/LogEntry.cc | 58 ++++++++++++++++++++++++++-------------------- livestatus/src/LogEntry.h | 6 +++-- livestatus/src/TableLog.cc | 2 +- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index c59d059..91a58f4 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -28,12 +28,14 @@ #include <unordered_map> #include <utility> #include "MonitoringCore.h" -#include "StringUtils.h" -using mk::starts_with; using std::string; using std::unordered_map; +// 0123456789012345678901234567890 +// [1234567890] FOO BAR: blah blah +static constexpr size_t timestamp_prefix_length = 13; + // TODO(sp) Fix classifyLogMessage() below to always set all fields and remove // this set-me-to-zero-to-be-sure-block. LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, string line) @@ -54,9 +56,6 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, string line) } _options = &_complete[pos]; - // 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] != ' ') { @@ -69,7 +68,7 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, string line) return; // ignore invalid lines silently } - classifyLogMessage(&_complete[timestamp_prefix_length]); + classifyLogMessage(); applyWorkarounds(); updateReferences(mc); } @@ -263,51 +262,52 @@ std::vector<LogEntry::LogDef> LogEntry::log_definitions // NOLINT //////////////// LogDef{"EXTERNAL COMMAND", Class::ext_command, LogEntryType::none, {}}}; -void LogEntry::classifyLogMessage(const string &text) { +// A bit verbose, but we avoid unnecessary string copies below. +void LogEntry::classifyLogMessage() { for (const auto &def : log_definitions) { - if (starts_with(text, def.prefix) && - text.compare(def.prefix.size(), 2, ": ") == 0) { - _text = def.prefix; + if (textStartsWith(def.prefix) && + _complete.compare(timestamp_prefix_length + def.prefix.size(), 2, + ": ") == 0) { + _text = &def.prefix[0]; _logclass = def.log_class; _type = def.log_type; // TODO(sp) Use boost::tokenizer instead of this index fiddling - size_t pos = def.prefix.size() + 2; + size_t pos = timestamp_prefix_length + def.prefix.size() + 2; for (Param par : def.params) { - size_t sep_pos = text.find(';', pos); + size_t sep_pos = _complete.find(';', pos); size_t end_pos = - sep_pos == string::npos ? text.size() : sep_pos; - assign(par, text.substr(pos, end_pos - pos)); - pos = sep_pos == string::npos ? text.size() : (sep_pos + 1); + sep_pos == string::npos ? _complete.size() : sep_pos; + assign(par, _complete.substr(pos, end_pos - pos)); + pos = + sep_pos == string::npos ? _complete.size() : (sep_pos + 1); } return; } } - _text = text; - if (starts_with(text, "LOG VERSION: 2.0")) { + _text = &_complete[timestamp_prefix_length]; + if (textStartsWith("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")) { + if (textStartsWith("logging initial states") || + textStartsWith("logging intitial states")) { _logclass = Class::program; _type = LogEntryType::log_initial_states; return; } - if (text.find("starting...") != string::npos || - text.find("active mode...") != string::npos) { + if (textContains("starting...") || textContains("active mode...")) { _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) { + if (textContains("shutting down...") || textContains("Bailing out") || + textContains("standby mode...")) { _logclass = Class::program; _type = LogEntryType::core_stopping; return; } - if (text.find("restarting...") != string::npos) { + if (textContains("restarting...")) { _logclass = Class::program; _type = LogEntryType::none; return; @@ -316,6 +316,14 @@ void LogEntry::classifyLogMessage(const string &text) { _type = LogEntryType::none; } +bool LogEntry::textStartsWith(const string &what) { + return _complete.compare(timestamp_prefix_length, what.size(), what) == 0; +} + +bool LogEntry::textContains(const string &what) { + return _complete.find(what, timestamp_prefix_length) != string::npos; +} + // The NotifyHelper class has a long, tragic history: Through a long series of // commits, it suffered from spelling mistakes like "HOST_NOTIFICATION" or "HOST // NOTIFICATION" (without a colon), parameter lists not matching the diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index f45f23d..f24267e 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -82,7 +82,7 @@ public: LogEntryType _type; std::string _complete; // copy of complete unsplit message const char *_options; // points into _complete after ':' - std::string _text; + const char *_text; // points into _complete or into static data std::string _host_name; std::string _svc_desc; std::string _command_name; @@ -130,7 +130,9 @@ private: bool assign(Param par, const std::string &field); void applyWorkarounds(); - void classifyLogMessage(const std::string &text); + void classifyLogMessage(); + bool textStartsWith(const std::string &what); + bool textContains(const std::string &what); }; #endif // LogEntry_h diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 1f55496..bf320a3 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -71,7 +71,7 @@ TableLog::TableLog(MonitoringCore *mc, LogCache *log_cache) addColumn(make_unique<OffsetSStringColumn>( "message", "The complete message line including the timestamp", DANGEROUS_OFFSETOF(LogEntry, _complete), -1, -1, -1)); - addColumn(make_unique<OffsetSStringColumn>( + addColumn(make_unique<OffsetStringColumn>( "type", "The type of the message (text before the colon), the message itself for info messages", DANGEROUS_OFFSETOF(LogEntry, _text), -1, -1, -1));

7 years, 2 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: f074e1d245e2299f8f252885308337efbecbb903 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f074e1d245e229… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 2 14:54:39 2017 +0200 Reserved 20 Werk IDS Change-Id: I5231b9591842ac0f7e54ab08993be7b6b8e631e7 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index a89599c..1a74b28 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5078 +5098

7 years, 2 months

5078 FIX lnx_distro: Detects version and name of Check_MK Appliance correctly

by Simon Betz

Module: check_mk Branch: master Commit: db8fd37b68d347ddcd83537901bee30987cdb6eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db8fd37b68d347… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 2 14:57:02 2017 +0200 5078 FIX lnx_distro: Detects version and name of Check_MK Appliance correctly Change-Id: Ia11f64c10b40673e545dc6ab5fa6ae3d2222a54f --- .werks/5078 | 11 +++++++++++ inventory/lnx_distro | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5078 b/.werks/5078 new file mode 100644 index 0000000..7ce0faf --- /dev/null +++ b/.werks/5078 @@ -0,0 +1,11 @@ +Title: lnx_distro: Detects version and name of Check_MK Appliance correctly +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1501678510 + + diff --git a/inventory/lnx_distro b/inventory/lnx_distro index 7aa3641..1ab82a2 100644 --- a/inventory/lnx_distro +++ b/inventory/lnx_distro @@ -157,9 +157,9 @@ def inv_lnx_parse_debian(node, line): def inv_lnx_parse_cma(node, line): - node["name"] = "Check_MK Appliance " + line[1] + node["name"] = "Check_MK Appliance " + line[0] node["vendor"] = "Mathias Kettner GmbH" - node["version"] = line[1] + node["version"] = line[0] if "code_name" in node: del node["code_name"]

7 years, 2 months

Sanitize signatures: Pass string values around, and use std::

by Sven Panne

move when appropriate. Message-ID: <5981b814.buUROqiU3UsuPPY8%sp(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 746e09389c6c6d249c240b18c29d6e4e8ab7ce55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=746e09389c6c6d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 2 13:05:49 2017 +0200 Sanitize signatures: Pass string values around, and use std::move when appropriate. Change-Id: I982b6a4ae21a18d7dcd4cd64cf1802567f194a6a --- livestatus/src/LogEntry.cc | 6 +++--- livestatus/src/LogEntry.h | 2 +- livestatus/src/Logfile.cc | 7 +++---- livestatus/src/Logfile.h | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index a81d923..c59d059 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -36,9 +36,9 @@ using std::unordered_map; // TODO(sp) Fix classifyLogMessage() 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) +LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, string line) : _lineno(lineno) - , _complete(line) + , _complete(std::move(line)) , _state(0) , _attempt(0) , _host(nullptr) @@ -69,7 +69,7 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, const char *line) return; // ignore invalid lines silently } - classifyLogMessage(line + timestamp_prefix_length); + classifyLogMessage(&_complete[timestamp_prefix_length]); applyWorkarounds(); updateReferences(mc); } diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index 24771a7..f45f23d 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, const char *line); + LogEntry(MonitoringCore *mc, unsigned lineno, std::string 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 66a596e..71625f9 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -174,8 +174,7 @@ void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, } } if (processLogLine(_lineno, &linebuffer[0], missing_types)) { - logcache->handleNewMessage(this, since, until, - logclasses); // memory management + logcache->handleNewMessage(this, since, until, logclasses); } } } @@ -200,9 +199,9 @@ long Logfile::freeMessages(unsigned logclasses) { return freed; } -bool Logfile::processLogLine(uint32_t lineno, const char *line, +bool Logfile::processLogLine(uint32_t lineno, string line, unsigned logclasses) { - auto entry = make_unique<LogEntry>(_mc, lineno, line); + auto entry = make_unique<LogEntry>(_mc, lineno, std::move(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 0b1567d..5fc5663 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -93,7 +93,7 @@ public: private: void loadRange(FILE *file, unsigned missing_types, LogCache *, time_t since, time_t until, unsigned logclasses); - bool processLogLine(uint32_t lineno, const char *line, unsigned logclasses); + bool processLogLine(uint32_t lineno, std::string line, unsigned logclasses); uint64_t makeKey(time_t, unsigned); Logger *logger() const; };

7 years, 2 months

get_nested_group_memberships() can now handle pattern searches correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ecb8db40599c3299bf9c03a88a7c771a5aad901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ecb8db40599c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 10:03:58 2017 +0200 get_nested_group_memberships() can now handle pattern searches correctly Change-Id: Ic771861c0ec12eb9eba513c69bf1bf82348ca819 --- web/plugins/userdb/ldap.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index e28b33c..200371f 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -874,28 +874,32 @@ class LDAPUserConnector(UserConnector): def get_nested_group_memberships(self, filters, filt_attr): groups = {} for filter_val in filters: + matched_groups = {} + if filt_attr == 'cn': result = self.ldap_search(self.get_group_dn(), '(&%s(cn=%s))' % (self.ldap_filter('groups'), filter_val), - ['dn'], self._config['group_scope']) + ['dn', 'cn'], self._config['group_scope']) if not result: continue # Skip groups which can not be found - dn = result[0][0] - cn = filter_val + + for dn, cn in result: + matched_groups[dn] = cn else: - dn = filter_val # in case of asking with DNs in nested mode, the resulting objects have the # cn set to None for all objects. We do not need it in that case. - cn = None + matched_groups[dn] = None - filt = '(&%s(memberOf:1.2.840.113556.1.4.1941:=%s))' % (self.ldap_filter('users'), dn) - groups[dn] = { - 'members' : [], - 'cn' : cn, - } - for user_dn, obj in self.ldap_search(self.get_user_dn(), - filt, ['dn'], self._config['user_scope']): - groups[dn]['members'].append(user_dn.lower()) + for dn, cn in matched_groups.items(): + filt = '(&%s(memberOf:1.2.840.113556.1.4.1941:=%s))' % \ + (self.ldap_filter('users'), dn) + groups[dn] = { + 'members' : [], + 'cn' : cn, + } + for user_dn, obj in self.ldap_search(self.get_user_dn(), + filt, ['dn'], self._config['user_scope']): + groups[dn]['members'].append(user_dn.lower()) return groups

7 years, 2 months

Make cppcheck happy again.

by Sven Panne

Module: check_mk Branch: master Commit: 4bbcc9217b802267df826566d211e4dd38bf06c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bbcc9217b8022… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 2 09:20:26 2017 +0200 Make cppcheck happy again. Change-Id: If6384a4943ad630bdf0a26ee1a413509aa654643 --- livestatus/src/LogEntry.cc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index a4624f1..f6b526a 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -34,17 +34,16 @@ using mk::starts_with; using std::string; using std::unordered_map; -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; - _attempt = 0; - _host = nullptr; - _service = nullptr; - _contact = nullptr; - _lineno = lineno; - _complete = line; - +// TODO(sp) Fix classifyLogMessage() 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) + : _lineno(lineno) + , _complete(line) + , _state(0) + , _attempt(0) + , _host(nullptr) + , _service(nullptr) + , _contact(nullptr) { // pointer to options (everything after ':') size_t pos = _complete.find(':'); if (pos != string::npos) {

7 years, 2 months

5024 FIX Fixed parsing of some host-related monitoring history entries.

by Sven Panne

Module: check_mk Branch: master Commit: a3974888385aa3bae0b2bdfe0b094d27513add3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3974888385aa3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 2 09:24:17 2017 +0200 5024 FIX Fixed parsing of some host-related monitoring history entries. Some log lines in the monitoring history were classified incorrectly, leading to possibly wrong results in e.g. availibility calculations. This has been fixed. The affected kind of lines were: INITIAL HOST STATE CURRENT HOST STATE HOST ALERT Change-Id: Ice7d9a20794fde0bfebacd01e9800b9ad6d6292a --- .werks/5024 | 18 ++++++++++++++++++ livestatus/src/LogEntry.cc | 10 +++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.werks/5024 b/.werks/5024 new file mode 100644 index 0000000..faacfdc --- /dev/null +++ b/.werks/5024 @@ -0,0 +1,18 @@ +Title: Fixed parsing of some host-related monitoring history entries. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1501658483 +Class: fix + +Some log lines in the monitoring history were classified incorrectly, +leading to possibly wrong results in e.g. availibility calculations. This +has been fixed. + +The affected kind of lines were: + + INITIAL HOST STATE + CURRENT HOST STATE + HOST ALERT diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index f6b526a..a81d923 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -117,20 +117,20 @@ bool LogEntry::assign(Param par, const string &field) { // False positive in clang-tidy-4.0, see https://reviews.llvm.org/D27048 std::vector<LogEntry::LogDef> LogEntry::log_definitions // NOLINT {LogDef{"INITIAL HOST STATE", - Class::alert, - LogEntryType::alert_host, + Class::state, + LogEntryType::state_host_initial, {Param::HostName, Param::HostState, Param::StateType, Param::Attempt, Param::CheckOutput}}, //////////////// LogDef{"CURRENT HOST STATE", Class::state, - LogEntryType::state_host_initial, + LogEntryType::state_host, {Param::HostName, Param::HostState, Param::StateType, Param::Attempt, Param::CheckOutput}}, //////////////// LogDef{"HOST ALERT", - Class::state, - LogEntryType::state_host, + Class::alert, + LogEntryType::alert_host, {Param::HostName, Param::HostState, Param::StateType, Param::Attempt, Param::CheckOutput}}, ////////////////

7 years, 2 months

Fixed broken analyse services automation ("Check origin and parameters" were missing on analyse services page of WATO)

by Lars Michelsen

Module: check_mk Branch: master Commit: 3aa6e1d3cd84d94c39daf9d83ebf4de2db144fbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aa6e1d3cd84d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 2 08:50:30 2017 +0200 Fixed broken analyse services automation ("Check origin and parameters" were missing on analyse services page of WATO) Change-Id: I9d91fd71a6f7962304bf89c6105918045e53cbc8 --- cmk_base/automations/check_mk.py | 55 ++++++++++-------------- tests/cmk_base/test_automations.py | 88 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 32 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 47efb9a..139ee35 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -519,39 +519,30 @@ class AutomationAnalyseServices(Automation): # 2. Load all autochecks of the host in question and try to find # our service there - try: - path = "%s/%s.mk" % (cmk.paths.autochecks_dir, hostname) - if os.path.exists(path): - for entry in eval(file(path).read()): - if len(entry) == 4: # old format - hn, ct, item, params = entry - else: - ct, item, params = entry # new format without host name - hn = hostname - - if (ct, item) not in table: - continue # this is a removed duplicate or clustered service - descr = config.service_description(hn, ct, item) - if hn == hostname and descr == servicedesc: - dlv = checks.check_info[ct].get("default_levels_variable") - if dlv: - fs = checks.factory_settings.get(dlv, None) - else: - fs = None + for entry in discovery.read_autochecks_of(hostname): + ct, item, params = entry # new format without host name - return { - "origin" : "auto", - "checktype" : ct, - "checkgroup" : checks.check_info[ct].get("group"), - "item" : item, - "inv_parameters" : params, - "factory_settings" : fs, - "parameters" : - checks.compute_check_parameters(hostname, ct, item, params), - } - except: - if cmk.debug.enabled(): - raise + if (ct, item) not in table: + continue # this is a removed duplicate or clustered service + + descr = config.service_description(hostname, ct, item) + if descr == servicedesc: + dlv = checks.check_info[ct].get("default_levels_variable") + if dlv: + fs = checks.factory_settings.get(dlv, None) + else: + fs = None + + return { + "origin" : "auto", + "checktype" : ct, + "checkgroup" : checks.check_info[ct].get("group"), + "item" : item, + "inv_parameters" : params, + "factory_settings" : fs, + "parameters" : + checks.compute_check_parameters(hostname, ct, item, params), + } # 3. Classical checks for nr, entry in enumerate(config.custom_checks): diff --git a/tests/cmk_base/test_automations.py b/tests/cmk_base/test_automations.py new file mode 100644 index 0000000..34699a4 --- /dev/null +++ b/tests/cmk_base/test_automations.py @@ -0,0 +1,88 @@ +import pytest +import subprocess + +from testlib import web, repo_path +import ast + +(a)pytest.fixture(scope="module") +def test_cfg(web, site): + print "Applying default config" + web.add_host("modes-test-host", attributes={ + "ipaddress": "127.0.0.1", + }) + web.add_host("modes-test-host2", attributes={ + "ipaddress": "127.0.0.1", + "tag_criticality": "test", + }) + web.add_host("modes-test-host3", attributes={ + "ipaddress": "127.0.0.1", + "tag_criticality": "test", + }) + web.add_host("modes-test-host4", attributes={ + "ipaddress": "127.0.0.1", + "tag_criticality": "offline", + }) + + site.write_file("etc/check_mk/conf.d/modes-test-host.mk", + "datasource_programs.append(('cat ~/var/check_mk/agent_output/<HOST>', [], ALL_HOSTS))\n") + + site.makedirs("var/check_mk/agent_output/") + site.write_file("var/check_mk/agent_output/modes-test-host", + file("%s/tests/data/linux-agent-output" % repo_path()).read()) + site.write_file("var/check_mk/agent_output/modes-test-host2", + file("%s/tests/data/linux-agent-output" % repo_path()).read()) + site.write_file("var/check_mk/agent_output/modes-test-host3", + file("%s/tests/data/linux-agent-output" % repo_path()).read()) + + web.discover_services("modes-test-host") + web.discover_services("modes-test-host2") + web.discover_services("modes-test-host3") + + web.activate_changes() + yield None + + # + # Cleanup code + # + print "Cleaning up test config" + + site.delete_dir("var/check_mk/agent_output") + + site.delete_file("etc/check_mk/conf.d/modes-test-host.mk") + + web.delete_host("modes-test-host") + web.delete_host("modes-test-host2") + web.delete_host("modes-test-host3") + web.delete_host("modes-test-host4") + +#. +# .--automation----------------------------------------------------------. +# | _ _ _ | +# | __ _ _ _| |_ ___ _ __ ___ __ _| |_(_) ___ _ __ | +# | / _` | | | | __/ _ \| '_ ` _ \ / _` | __| |/ _ \| '_ \ | +# | | (_| | |_| | || (_) | | | | | | (_| | |_| | (_) | | | | | +# | \__,_|\__,_|\__\___/|_| |_| |_|\__,_|\__|_|\___/|_| |_| | +# | | +# '----------------------------------------------------------------------' + +def test_automation_analyse_service_autocheck(test_cfg, site): + p = site.execute(["cmk", "--automation", "analyse-service", "--", "modes-test-host", "CPU load"], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() + assert p.wait() == 0 + assert stderr == "" + data = ast.literal_eval(stdout) + + assert data["origin"] == "auto" + assert data["checktype"] == "cpu.loads" + assert data["item"] == None + assert data["checkgroup"] == "cpu_load" + + +def test_automation_analyse_service_no_check(test_cfg, site): + p = site.execute(["cmk", "--automation", "analyse-service", "--", "modes-test-host", "XXX CPU load"], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() + assert p.wait() == 0 + assert stderr == "" + assert stdout == "{}\n"

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