Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

7189 Bookmark lists: Individual topics per bookmark can now be choosen from predefined topics

by Lars Michelsen

Module: check_mk Branch: master Commit: 9734ef3c93f31af42d8540144e54dbe7a32a93bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9734ef3c93f31a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 14:44:19 2019 +0100 7189 Bookmark lists: Individual topics per bookmark can now be choosen from predefined topics The individual topics that are defined in an existing bookmark list can now be choosen from a dropdown field when creating new bookmark entries with individual topic. CMK-1754 Change-Id: I378af578e8de3402bf712aa0f6bb21e7e771a9bc --- .werks/7189 | 11 +++++++++++ cmk/gui/plugins/sidebar/bookmarks.py | 29 +++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/.werks/7189 b/.werks/7189 new file mode 100644 index 0000000..a8a300c --- /dev/null +++ b/.werks/7189 @@ -0,0 +1,11 @@ +Title: Bookmark lists: Individual topics per bookmark can now be choosen from predefined topics +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551274970 +Class: feature + +The individual topics that are defined in an existing bookmark list can now be choosen from +a dropdown field when creating new bookmark entries with individual topic. diff --git a/cmk/gui/plugins/sidebar/bookmarks.py b/cmk/gui/plugins/sidebar/bookmarks.py index 454fa5e..7b8cace 100644 --- a/cmk/gui/plugins/sidebar/bookmarks.py +++ b/cmk/gui/plugins/sidebar/bookmarks.py @@ -42,6 +42,7 @@ from cmk.gui.valuespec import ( IconSelector, Alternative, FixedValue, + OptionalDropdownChoice, ) from . import ( @@ -135,24 +136,44 @@ class BookmarkList(pagetypes.Overridable): @classmethod def _vs_topic(cls): + choices = cls._topic_choices() + return Alternative( elements=[ FixedValue( None, title=_("Use default topic"), - totext=_("(default topic)"), + totext=_(""), ), - TextUnicode( + OptionalDropdownChoice( title=_("Individual topic"), - size=30, - allow_empty=False, + choices=choices, + default_value=choices[0][0] if choices else "", + explicit=TextUnicode( + size=30, + allow_empty=False, + ), + otherlabel="%s" % _("Add new topic"), ), ], title=_("Topic") + "<sup>*</sup>", style="dropdown", + orientation="horizontal", ) @classmethod + def _topic_choices(cls): + topics = set() + for instance in cls.instances_sorted(): + if (instance.is_mine() and instance.may_see()) or \ + (not instance.is_mine() and instance.is_public() and instance.may_see()): + for topic, _bookmarks in instance.bookmarks_by_topic(): + if topic is None: + topic = instance.default_bookmark_topic() + topics.add(topic) + return [(t, t) for t in sorted(list(topics))] + + @classmethod def validate_url(cls, value, varprefix): parsed = urlparse.urlparse(value)

5 years, 7 months

Removed micro-optimization.

by Sven Panne

Module: check_mk Branch: master Commit: bec02ebf7b587e2af38d7e09b676c152b78557dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bec02ebf7b587e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 27 15:42:34 2019 +0100 Removed micro-optimization. Change-Id: I5ae96c64422b8a40cb2e0bb3e2c0551cab34088a --- livestatus/src/LogCache.cc | 9 +++------ livestatus/src/Logfile.cc | 5 ----- livestatus/src/Logfile.h | 1 - 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 49380d1..c25b00c 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -123,8 +123,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { break; } if (it->second->size() > 0) { - _num_cached_log_messages -= it->second->size(); - it->second->flush(); // drop all messages of that file + _num_cached_log_messages -= it->second->freeMessages(~0); if (_num_cached_log_messages <= _mc->maxCachedMessages()) { // remember the number of log messages in cache when // the last memory-release was done. No further @@ -148,8 +147,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { Debug(logger()) << "freeing classes " << ~logclasses << " of file " << it->second->path(); // flush only messages not needed for current query - long freed = it->second->freeMessages(~logclasses); - _num_cached_log_messages -= freed; + _num_cached_log_messages -= it->second->freeMessages(~logclasses); if (_num_cached_log_messages <= _mc->maxCachedMessages()) { _num_at_last_check = _num_cached_log_messages; return; @@ -165,8 +163,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { if (it->second->size() > 0) { Debug(logger()) << "flush newer log, " << it->second->size() << " number of entries"; - _num_cached_log_messages -= it->second->size(); - it->second->flush(); + _num_cached_log_messages -= it->second->freeMessages(~0); if (_num_cached_log_messages <= _mc->maxCachedMessages()) { _num_at_last_check = _num_cached_log_messages; return; diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index f824d98..067b147 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -70,11 +70,6 @@ Logfile::Logfile(Logger *logger, LogCache *log_cache, fs::path path, bool watch) , _lineno(0) , _logclasses_read(0) {} -void Logfile::flush() { - _entries.clear(); - _logclasses_read = 0; -} - void Logfile::load(size_t max_lines_per_logfile, unsigned logclasses) { unsigned missing_types = logclasses & ~_logclasses_read; // The current logfile has the _watch flag set to true. diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index c7dd033..b28099d 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -46,7 +46,6 @@ public: fs::path path() const { return _path; } // for tricky protocol between LogCache::logLineHasBeenAdded and this class - void flush(); time_t since() const { return _since; } unsigned classesRead() const { return _logclasses_read; } size_t size() const { return _entries.size(); }

5 years, 7 months

Tiny comment improvements.

by Sven Panne

Module: check_mk Branch: master Commit: 75228a497c7c4093e251a541706e9d8f456139d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75228a497c7c40… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 27 15:47:44 2019 +0100 Tiny comment improvements. Change-Id: Ifd1a7862c7aed5d87454fbbd447bb9408253d440 --- livestatus/src/LogCache.cc | 54 ++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index c25b00c..30068de 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -91,43 +91,35 @@ void LogCache::addToIndex(std::unique_ptr<Logfile> logfile) { _logfiles.emplace(since, std::move(logfile)); } -/* This method is called each time a log message is loaded - into memory. If the number of messages loaded in memory - is to large, memory will be freed by flushing logfiles - and message not needed by the current query. - - The parameters to this method reflect the current query, - not the messages that just has been loaded. - */ +// This method is called each time a log message is loaded into memory. If the +// number of messages loaded in memory is too large, memory will be freed by +// flushing logfiles and message not needed by the current query. +// +// The parameters to this method reflect the current query, not the messages +// that have just been loaded. void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { if (++_num_cached_log_messages <= _mc->maxCachedMessages()) { return; // current message count still allowed, everything ok } - /* Memory checking an freeing consumes CPU resources. We save - resources, by avoiding to make the memory check each time - a new message is loaded when being in a sitation where no - memory can be freed. We do this by suppressing the check when - the number of messages loaded into memory has not grown - by at least check_mem_cycle messages */ + // Memory checking and freeing consumes CPU resources. We save resources by + // avoiding the memory check each time a new message is loaded when being in + // a sitation where no memory can be freed. We do this by suppressing the + // check when the number of messages loaded into memory has not grown by at + // least check_mem_cycle messages. if (_num_cached_log_messages < _num_at_last_check + check_mem_cycle) { return; // Do not check this time } - // [1] Begin by deleting old logfiles - // Begin deleting with the oldest logfile available + // [1] Delete old logfiles: Begin deleting with the oldest logfile available logfiles_t::iterator it; for (it = _logfiles.begin(); it != _logfiles.end(); ++it) { if (it->second.get() == logfile) { - // Do not touch the logfile the Query is currently accessing - break; + break; // Do not touch the logfile the Query is currently accessing } if (it->second->size() > 0) { _num_cached_log_messages -= it->second->freeMessages(~0); if (_num_cached_log_messages <= _mc->maxCachedMessages()) { - // remember the number of log messages in cache when - // the last memory-release was done. No further - // release-check shall be done until that number changes. _num_at_last_check = _num_cached_log_messages; return; } @@ -138,15 +130,14 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { // We save that pointer for later. auto queryit = it; - // [2] Delete message classes irrelevent to current query - // Starting from the current logfile (wo broke out of the - // previous loop just when 'it' pointed to that) + // [2] Delete message classes irrelevent to current query: Starting from the + // current logfile (we broke out of the previous loop just when 'it' pointed + // to that) for (; it != _logfiles.end(); ++it) { if (it->second->size() > 0 && (it->second->classesRead() & ~logclasses) != 0) { Debug(logger()) << "freeing classes " << ~logclasses << " of file " << it->second->path(); - // flush only messages not needed for current query _num_cached_log_messages -= it->second->freeMessages(~logclasses); if (_num_cached_log_messages <= _mc->maxCachedMessages()) { _num_at_last_check = _num_cached_log_messages; @@ -155,10 +146,9 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { } } - // [3] Flush newest logfiles - // If there are still too many messages loaded, continue - // flushing logfiles from the oldest to the newest starting - // at the file just after (i.e. newer than) the current logfile + // [3] Flush newest logfiles: If there are still too many messages loaded, + // continue flushing logfiles from the oldest to the newest starting at the + // file just after (i.e. newer than) the current logfile for (it = ++queryit; it != _logfiles.end(); ++it) { if (it->second->size() > 0) { Debug(logger()) << "flush newer log, " << it->second->size() @@ -170,11 +160,9 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { } } } + // If we reach this point, no more logfiles can be unloaded, despite the + // fact that there are still too many messages loaded. _num_at_last_check = _num_cached_log_messages; - // If we reach this point, no more logfiles can be unloaded, - // despite the fact that there are still too many messages - // loaded. - Debug(logger()) << "cannot unload more messages, still " << _num_cached_log_messages << " loaded (max is " << _mc->maxCachedMessages() << ")";

5 years, 7 months

Decouple LogEntry from MonitoringCore, part 1.

by Sven Panne

Module: check_mk Branch: master Commit: 22f1bc277e5343b87e002e97f80c50e32a8678fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22f1bc277e5343… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 27 08:20:55 2019 +0100 Decouple LogEntry from MonitoringCore, part 1. We shift the lookup of hosts, services, etc. to the moment when they are actually needed. This commit does it for TableLog, more to come... CMK-1753 Change-Id: Ifcbeadd00365860363009493e83661e8cdb4cdd0 --- livestatus/src/LogEntry.cc | 13 +----- livestatus/src/LogEntry.h | 6 +-- livestatus/src/TableLog.cc | 104 +++++++++++++++++++++++++++------------------ livestatus/src/TableLog.h | 4 +- 4 files changed, 68 insertions(+), 59 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=22f1bc277e…

5 years, 7 months

Decouple LogEntry from MonitoringCore, part 3.

by Sven Panne

Module: check_mk Branch: master Commit: d4299df890fdc9b98b9217b61fd7561709796661 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4299df890fdc9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 27 12:44:25 2019 +0100 Decouple LogEntry from MonitoringCore, part 3. Now we can remove quite a bit of dead code & fields and a handful of ugly '#ifdef CMC' conditionals. CMK-1753 Change-Id: If85d752e97fd67e19bf6a3d318d3ab38df26bc64 --- livestatus/src/LogEntry.cc | 26 ++++---------------------- livestatus/src/LogEntry.h | 9 +-------- livestatus/src/Logfile.cc | 30 ++---------------------------- livestatus/src/Logfile.h | 8 -------- 4 files changed, 7 insertions(+), 66 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 591c1b3..7fabd1d 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -27,7 +27,6 @@ #include <stdexcept> #include <unordered_map> #include <utility> -#include "MonitoringCore.h" // 0123456789012345678901234567890 // [1234567890] FOO BAR: blah blah @@ -35,13 +34,11 @@ 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, size_t lineno, std::string line) +LogEntry::LogEntry(size_t lineno, std::string line) : _lineno(static_cast<int32_t>(lineno)) , _message(std::move(line)) , _state(0) - , _attempt(0) - , _host(nullptr) - , _service(nullptr) { + , _attempt(0) { // pointer to options (everything after ':') size_t pos = _message.find(':'); if (pos != std::string::npos) { @@ -66,7 +63,6 @@ LogEntry::LogEntry(MonitoringCore *mc, size_t lineno, std::string line) classifyLogMessage(); applyWorkarounds(); - updateReferences(mc); } bool LogEntry::assign(Param par, const std::string &field) { @@ -389,28 +385,14 @@ std::unordered_map<std::string, HostState> hostStateTypes{ {"UNKNOWN", HostState::up}}; } // namespace +// static ServiceState LogEntry::parseServiceState(const std::string &str) { auto it = serviceStateTypes.find(extractStateType(str)); return it == serviceStateTypes.end() ? ServiceState::ok : it->second; } +// static HostState LogEntry::parseHostState(const std::string &str) { auto it = hostStateTypes.find(extractStateType(str)); return it == hostStateTypes.end() ? HostState::up : it->second; } - -unsigned LogEntry::updateReferences(MonitoringCore *mc) { - unsigned updated = 0; - if (!_host_name.empty()) { - // TODO(sp): Remove ugly cast. - _host = reinterpret_cast<host *>(mc->find_host(_host_name)); - updated++; - } - if (!_service_description.empty()) { - // TODO(sp): Remove ugly cast. - _service = reinterpret_cast<service *>( - mc->find_service(_host_name, _service_description)); - updated++; - } - return updated; -} diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index ac341bd..b2d6aff 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -30,8 +30,6 @@ #include <ctime> #include <string> #include <vector> -#include "nagios.h" -class MonitoringCore; enum class ServiceState { ok = 0, warning = 1, critical = 2, unknown = 3 }; @@ -121,13 +119,8 @@ public: std::string _plugin_output; std::string _comment; - // NOTE: The following two fields contain only derived information. - host *_host; - service *_service; - // NOTE: line gets modified! - LogEntry(MonitoringCore *mc, size_t lineno, std::string line); - unsigned updateReferences(MonitoringCore *mc); + LogEntry(size_t lineno, std::string line); 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 7d02c6d..a8fe802 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -35,10 +35,6 @@ #include "Logger.h" #include "MonitoringCore.h" -#ifdef CMC -#include "cmc.h" -#endif - namespace { time_t firstTimestampOf(const fs::path &path, Logger *logger) { std::ifstream is(path, std::ios::binary); @@ -74,11 +70,7 @@ Logfile::Logfile(MonitoringCore *mc, LogCache *log_cache, fs::path path, , _watch(watch) , _read_pos{} , _lineno(0) -#ifdef CMC - , _world(nullptr) -#endif - , _logclasses_read(0) { -} + , _logclasses_read(0) {} void Logfile::flush() { _entries.clear(); @@ -183,7 +175,7 @@ long Logfile::freeMessages(unsigned logclasses) { bool Logfile::processLogLine(size_t lineno, std::string line, unsigned logclasses) { - auto entry = std::make_unique<LogEntry>(_mc, lineno, std::move(line)); + auto entry = std::make_unique<LogEntry>(lineno, std::move(line)); // ignored invalid lines if (entry->_class == LogEntry::Class::invalid) { return false; @@ -202,8 +194,6 @@ bool Logfile::processLogLine(size_t lineno, std::string line, } const logfile_entries_t *Logfile::getEntriesFor(unsigned logclasses) { - // Make sure existing references to objects point to correct world - updateReferences(); // make sure all messages are present load(logclasses); return &_entries; @@ -214,20 +204,4 @@ uint64_t Logfile::makeKey(time_t t, size_t lineno) { return (static_cast<uint64_t>(t) << 32) | static_cast<uint64_t>(lineno); } -void Logfile::updateReferences() { -#ifdef CMC - // If our references in cached log entries do not point to the currently - // active configuration world, then update all references - if (_world != g_live_world) { - unsigned num = 0; - for (auto &entry : _entries) { - num += entry.second->updateReferences(_mc); - } - Notice(logger()) << "updated " << num << " log cache references of " - << _path << " to new world."; - _world = g_live_world; - } -#endif -} - Logger *Logfile::logger() const { return _mc->loggerLivestatus(); } diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index f980344..6214c91 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -38,10 +38,6 @@ class LogEntry; class Logger; class MonitoringCore; -#ifdef CMC -class World; -#endif - // key is time_t . lineno using logfile_entries_t = std::map<uint64_t, std::unique_ptr<LogEntry>>; @@ -72,15 +68,11 @@ private: fpos_t _read_pos; // read until this position size_t _lineno; // read until this line logfile_entries_t _entries; -#ifdef CMC - World *_world; // CMC: world our references point into -#endif unsigned _logclasses_read; // only these types have been read void load(unsigned logclasses); void loadRange(FILE *file, unsigned missing_types, unsigned logclasses); bool processLogLine(size_t lineno, std::string line, unsigned logclasses); - void updateReferences(); Logger *logger() const; };

5 years, 7 months

Decouple Logfile class from MonitoringCore, easing testing.

by Sven Panne

Module: check_mk Branch: master Commit: bff9ba8c87116829bd83c00af64371aa62739896 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bff9ba8c871168… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 27 13:38:28 2019 +0100 Decouple Logfile class from MonitoringCore, easing testing. Change-Id: I593960e72e4442f2f9741bf80ab253e51ea95d39 --- livestatus/src/LogCache.cc | 6 +++--- livestatus/src/Logfile.cc | 40 ++++++++++++++++++------------------- livestatus/src/Logfile.h | 14 ++++++------- livestatus/src/TableLog.cc | 3 ++- livestatus/src/TableStateHistory.cc | 9 ++++++--- 5 files changed, 37 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bff9ba8c87…

5 years, 7 months

Simplification: Use MonitoringCore::maxCachedMessages more often.

by Sven Panne

Module: check_mk Branch: master Commit: a6255e7fc31a58576664b2537b99df6ebe9cdcac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6255e7fc31a58… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 27 14:31:35 2019 +0100 Simplification: Use MonitoringCore::maxCachedMessages more often. Much easier, and it even removes two ugly '#ifdef CMC' conditionals. Change-Id: I21d27471dfb8201b5689e561b85352178ae7b6aa --- livestatus/src/LogCache.cc | 28 +++++++--------------------- livestatus/src/LogCache.h | 6 +----- livestatus/src/Store.cc | 2 +- livestatus/src/Store.h | 1 - 4 files changed, 9 insertions(+), 28 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 61580d9..49380d1 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -37,25 +37,11 @@ namespace { constexpr unsigned long check_mem_cycle = 1000; } // namespace -LogCache::LogCache(MonitoringCore *mc, unsigned long max_cached_messages) - : _mc(mc) - , _num_cached_log_messages(0) - , _max_cached_messages(max_cached_messages) - , _num_at_last_check(0) { +LogCache::LogCache(MonitoringCore *mc) + : _mc(mc), _num_cached_log_messages(0), _num_at_last_check(0) { update(); } -#ifdef CMC -void LogCache::setMaxCachedMessages(unsigned long m) { - if (m != _max_cached_messages) { - Notice(logger()) - << "changing maximum number of messages for log file cache to " - << m; - _max_cached_messages = m; - } -} -#endif - void LogCache::update() { if (!_logfiles.empty() && _mc->last_logfile_rotation() <= _last_index_update) { @@ -114,7 +100,7 @@ void LogCache::addToIndex(std::unique_ptr<Logfile> logfile) { not the messages that just has been loaded. */ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { - if (++_num_cached_log_messages <= _max_cached_messages) { + if (++_num_cached_log_messages <= _mc->maxCachedMessages()) { return; // current message count still allowed, everything ok } @@ -139,7 +125,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { if (it->second->size() > 0) { _num_cached_log_messages -= it->second->size(); it->second->flush(); // drop all messages of that file - if (_num_cached_log_messages <= _max_cached_messages) { + if (_num_cached_log_messages <= _mc->maxCachedMessages()) { // remember the number of log messages in cache when // the last memory-release was done. No further // release-check shall be done until that number changes. @@ -164,7 +150,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { // flush only messages not needed for current query long freed = it->second->freeMessages(~logclasses); _num_cached_log_messages -= freed; - if (_num_cached_log_messages <= _max_cached_messages) { + if (_num_cached_log_messages <= _mc->maxCachedMessages()) { _num_at_last_check = _num_cached_log_messages; return; } @@ -181,7 +167,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { << " number of entries"; _num_cached_log_messages -= it->second->size(); it->second->flush(); - if (_num_cached_log_messages <= _max_cached_messages) { + if (_num_cached_log_messages <= _mc->maxCachedMessages()) { _num_at_last_check = _num_cached_log_messages; return; } @@ -194,7 +180,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { Debug(logger()) << "cannot unload more messages, still " << _num_cached_log_messages << " loaded (max is " - << _max_cached_messages << ")"; + << _mc->maxCachedMessages() << ")"; } size_t LogCache::numCachedLogMessages() const { diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 5b8954e..79cd9f2 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -41,10 +41,7 @@ class LogCache { public: std::mutex _lock; - LogCache(MonitoringCore *mc, unsigned long max_cached_messages); -#ifdef CMC - void setMaxCachedMessages(unsigned long m); -#endif + explicit LogCache(MonitoringCore *mc); size_t numCachedLogMessages() const; void logLineHasBeenAdded(Logfile *logfile, unsigned logclasses); void update(); @@ -54,7 +51,6 @@ public: private: MonitoringCore *const _mc; size_t _num_cached_log_messages; - size_t _max_cached_messages; size_t _num_at_last_check; logfiles_t _logfiles; std::chrono::system_clock::time_point _last_index_update; diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index a862898..5c1aa24 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -46,7 +46,7 @@ Store::Store(MonitoringCore *mc) : _mc(mc) , _downtimes(mc) , _comments(mc) - , _log_cache(mc, mc->maxCachedMessages()) + , _log_cache(mc) , _table_columns(mc) , _table_commands(mc) , _table_comments(mc) diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 669ac4d..9230d8c 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -84,7 +84,6 @@ public: bool answerGetRequest(const std::list<std::string> &lines, OutputBuffer &output, const std::string &tablename); void answerCommandRequest(const char *command, Logger *logger); - void setMaxCachedMessages(unsigned long m); void switchStatehistTable(); void buildStatehistCache(); void flushStatehistCache();

5 years, 7 months

Decouple LogEntry from MonitoringCore, part 2.

by Sven Panne

Module: check_mk Branch: master Commit: 1a116c130bba7c8e6c75750735bedb0cc1786f1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a116c130bba7c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 27 12:03:23 2019 +0100 Decouple LogEntry from MonitoringCore, part 2. This time we do this in TableStateHistory. CMK-1753 Change-Id: I5c7999595b2a85f2abf2d59bd22c33fe52bc3d18 --- livestatus/src/TableStateHistory.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 732c3d8..58b78d2 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -38,6 +38,7 @@ #include "HostServiceState.h" #include "LogEntry.h" #include "Logger.h" +#include "MonitoringCore.h" #include "OffsetDoubleColumn.h" #include "OffsetIntColumn.h" #include "OffsetSStringColumn.h" @@ -378,6 +379,11 @@ void TableStateHistory::answerQuery(Query *query) { HostServiceKey key = nullptr; bool is_service = false; + // TODO(sp): Remove ugly casts. + auto entry_host = + reinterpret_cast<host *>(core()->find_host(entry->_host_name)); + auto entry_service = reinterpret_cast<service *>(core()->find_service( + entry->_host_name, entry->_service_description)); switch (entry->_kind) { case LogEntryKind::none: case LogEntryKind::core_starting: @@ -391,7 +397,7 @@ void TableStateHistory::answerQuery(Query *query) { case LogEntryKind::state_service_initial: case LogEntryKind::downtime_alert_service: case LogEntryKind::flapping_service: - key = entry->_service; + key = entry_service; is_service = true; // fall-through case LogEntryKind::alert_host: @@ -400,7 +406,7 @@ void TableStateHistory::answerQuery(Query *query) { case LogEntryKind::downtime_alert_host: case LogEntryKind::flapping_host: { if (!is_service) { - key = entry->_host; + key = entry_host; } if (key == nullptr) { @@ -421,8 +427,8 @@ void TableStateHistory::answerQuery(Query *query) { // now state = new HostServiceState(); state->_is_host = entry->_service_description.empty(); - state->_host = entry->_host; - state->_service = entry->_service; + state->_host = entry_host; + state->_service = entry_service; state->_host_name = entry->_host_name; state->_service_description = entry->_service_description;

5 years, 7 months

Instance of 'set' has no 'append' member

by Simon Betz

Module: check_mk Branch: master Commit: bbc72013bd1dd06d158d3c4a498f20385fa5eb79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbc72013bd1dd0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 27 14:44:16 2019 +0100 Instance of 'set' has no 'append' member Change-Id: I9003f45525ca7ad9e0e3acffdad1bbd5b2e56f5c --- cmk/gui/wato/pages/services.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index e0e19ac..0d797b3 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -695,14 +695,14 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): services_to_save[(check_type, item)] = paramstring saved_services.add(descr) elif table_target == DiscoveryState.IGNORED: - add_disabled_rule.append(descr) + add_disabled_rule.add(descr) elif table_source == DiscoveryState.VANISHED: if table_target != DiscoveryState.REMOVED: services_to_save[(check_type, item)] = paramstring saved_services.add(descr) if table_target == DiscoveryState.IGNORED: - add_disabled_rule.append(descr) + add_disabled_rule.add(descr) elif table_source == DiscoveryState.MONITORED: if table_target in [ @@ -712,7 +712,7 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): services_to_save[(check_type, item)] = paramstring saved_services.add(descr) if table_target == DiscoveryState.IGNORED: - add_disabled_rule.append(descr) + add_disabled_rule.add(descr) elif table_source == DiscoveryState.IGNORED: if table_target in [ @@ -720,7 +720,7 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): DiscoveryState.UNDECIDED, DiscoveryState.VANISHED, ]: - remove_disabled_rule.append(descr) + remove_disabled_rule.add(descr) if table_target in [ DiscoveryState.MONITORED, DiscoveryState.IGNORED, @@ -728,7 +728,7 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): services_to_save[(check_type, item)] = paramstring saved_services.add(descr) if table_target == DiscoveryState.IGNORED: - add_disabled_rule.append(descr) + add_disabled_rule.add(descr) elif table_source in [ DiscoveryState.CLUSTERED_NEW,

5 years, 7 months

7188 Add context buttons linking to disabled checks/ services rulesets to discovery page

by Lars Michelsen

Module: check_mk Branch: master Commit: 0aa1541f58265387c5147f60c0a64c0152e19408 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0aa1541f582653… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 13:54:24 2019 +0100 7188 Add context buttons linking to disabled checks/services rulesets to discovery page Change-Id: I93304c3572ad201b660bf66f423a848b92b27232 --- .werks/7188 | 10 ++++++++++ cmk/gui/wato/pages/services.py | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/.werks/7188 b/.werks/7188 new file mode 100644 index 0000000..db450da --- /dev/null +++ b/.werks/7188 @@ -0,0 +1,10 @@ +Title: Add context buttons linking to disabled checks/services rulesets to discovery page +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551272034 +Class: feature + + diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index ac8c0c0..e0e19ac 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -218,6 +218,16 @@ class ModeDiscovery(WatoMode): watolib.folder_preserving_link([("mode", "diag_host"), ("host", self._host.name())]), "diagnose") + html.context_button( + _("Disabled services"), + watolib.folder_preserving_link([("mode", "edit_ruleset"), + ("varname", "ignored_services")]), "disabled_service") + + html.context_button( + _("Disabled checks"), + watolib.folder_preserving_link([("mode", "edit_ruleset"), + ("varname", "ignored_checks")]), "check_parameters") + def page(self): self._async_progress_msg_container() self._service_container()

5 years, 7 months

← Newer
1
2
3
4
5
6
7
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019