Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Honor AuthUser in NEB for host/service groups.

by Sven Panne

Module: check_mk Branch: master Commit: 3a45a73c4e8075ce237e5b35462273b9dfe70c9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a45a73c4e8075… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 2 14:37:57 2017 +0100 Honor AuthUser in NEB for host/service groups. Change-Id: I368a967b78088a45dd7f811a356bead14fb9666c --- livestatus/src/HostGroupsColumn.cc | 8 +++-- livestatus/src/HostGroupsColumn.h | 9 ++++-- livestatus/src/ServiceGroupsColumn.cc | 8 +++-- livestatus/src/ServiceGroupsColumn.h | 9 ++++-- livestatus/src/TableHostGroups.cc | 27 +--------------- livestatus/src/TableHosts.cc | 2 +- livestatus/src/TableHostsByGroup.cc | 34 ++++++++------------- livestatus/src/TableServiceGroups.cc | 29 ++---------------- livestatus/src/TableServices.cc | 4 +-- livestatus/src/TableServicesByGroup.cc | 27 +++++----------- livestatus/src/auth.cc | 56 ++++++++++++++++++++++++++++++++++ livestatus/src/auth.h | 4 +++ 12 files changed, 112 insertions(+), 105 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3a45a73c4e…

6 years, 11 months

additional update for WK5238

by Andreas Boesl

Module: check_mk Branch: master Commit: 98bc6b102a43324af82ef0625fcf386f29b685f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98bc6b102a4332… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 2 14:33:17 2017 +0100 additional update for WK5238 Change-Id: Ic40d68cb2797148d7cbd9bdd0eb13ab7f5597d01 --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b5bada1..8de080f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4608,7 +4608,7 @@ class SiteChoice(DropdownChoice): if default_site and default_site in authorized_site_ids: return default_site - return canonical_value() + return self.canonical_value() def _site_choices(self):

6 years, 11 months

update for WK5238

by Andreas Boesl

Module: check_mk Branch: master Commit: ed4f3cfac67389700cf3b21f4a433401687abf39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed4f3cfac67389… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 2 14:32:11 2017 +0100 update for WK5238 Change-Id: I2f427b4625fa1482a0872fff6e500cb1e21a8030 --- web/htdocs/valuespec.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ee74dea..b5bada1 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4607,7 +4607,8 @@ class SiteChoice(DropdownChoice): authorized_site_ids = map(lambda x: x[0], config.user.authorized_sites(unfiltered_sites=config.configured_sites())) if default_site and default_site in authorized_site_ids: return default_site - raise + + return canonical_value() def _site_choices(self):

6 years, 11 months

5238 FIX WATO users now only see their configured sites in the Site-DropdownChoice

by Andreas Boesl

Module: check_mk Branch: master Commit: 018961ddfb14ef8375905a8c8a176b012deb8884 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=018961ddfb14ef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 2 14:05:37 2017 +0100 5238 FIX WATO users now only see their configured sites in the Site-DropdownChoice A user can be configured only to see/configure a subset of the available sites. The site dropdown choice, however, always showed all available sites. This has been fixed. Change-Id: I79c45746211df5c911b96604680631d8de342306 --- .werks/5238 | 12 ++++++++++++ web/htdocs/valuespec.py | 29 ++++++++++++++++++++++++----- web/plugins/wato/builtin_attributes.py | 1 - 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/.werks/5238 b/.werks/5238 new file mode 100644 index 0000000..43661bb --- /dev/null +++ b/.werks/5238 @@ -0,0 +1,12 @@ +Title: WATO users now only see their configured sites in the Site-DropdownChoice +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509627717 +Class: fix + +A user can be configured only to see/configure a subset of the available sites. +The site dropdown choice, however, always showed all available sites. This has been fixed. + diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b29f9df..ee74dea 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -34,7 +34,7 @@ # -> rename to Boolean # -> Add alternative rendering "dropdown" -import math, os, time, re, sre_constants, urlparse, forms, tempfile +import math, os, time, re, sre_constants, urlparse, forms, tempfile, types import base64 import hashlib import socket @@ -99,7 +99,7 @@ class ValueSpec(object): # for same cases where the default value is known. def default_value(self): try: - if type(self._default_value) == type(lambda:True): + if type(self._default_value) in [types.FunctionType, types.MethodType]: return self._default_value() else: return self._default_value @@ -4583,14 +4583,13 @@ def ListOfCAs(**args): class SiteChoice(DropdownChoice): def __init__(self, **kwargs): - import config kwargs.setdefault("title", _("Site")) kwargs.setdefault("help", _("Specify the site of your choice")) - kwargs.setdefault("default_value", config.default_site()) + kwargs.setdefault("default_value", self._site_default_value) kwargs.setdefault("invalid_choice_error", _("The configured site is not known to this site.")) kwargs.update({ - "choices": config.site_choices, + "choices": self._site_choices, "invalid_choice": "complain", "invalid_choice_title": _("Unknown site (%s)"), }) @@ -4598,6 +4597,26 @@ class SiteChoice(DropdownChoice): super(SiteChoice, self).__init__(**kwargs) + def _site_default_value(self): + import watolib + if watolib.is_wato_slave_site(): + return False + + import config + default_site = config.default_site() + authorized_site_ids = map(lambda x: x[0], config.user.authorized_sites(unfiltered_sites=config.configured_sites())) + if default_site and default_site in authorized_site_ids: + return default_site + raise + + + def _site_choices(self): + import config + authorized_site_ids = map(lambda x: x[0], config.user.authorized_sites(unfiltered_sites=config.configured_sites())) + return config.site_choices(filter_func=lambda site_id, site: site_id in authorized_site_ids) + + + class TimeperiodSelection(ElementSelection): def __init__(self, **kwargs): diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 03d91a5..adf2eeb 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -490,7 +490,6 @@ class SiteAttribute(ValueSpecAttribute): ValueSpecAttribute.__init__(self, "site", SiteChoice( title=_("Monitored on site"), help=_("Specify the site that should monitor this host."), - default_value = default_site, invalid_choice_error = _("The configured site is not known to this site. In case you " "are configuring in a distributed slave, this may be a host " "monitored by another site. If you want to modify this "

6 years, 11 months

5430 FIX Pause page reloads when selecting timerange by using the graph previews

by Lars Michelsen

Module: check_mk Branch: master Commit: 603e80aa7c88b7bd393ed29aeeff5266692fa9ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=603e80aa7c88b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 2 12:53:55 2017 +0100 5430 FIX Pause page reloads when selecting timerange by using the graph previews Change-Id: Ifbd69fa7166fd83edee2c13fd02f62e48a567860 --- .werks/5430 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5430 b/.werks/5430 new file mode 100644 index 0000000..978c719 --- /dev/null +++ b/.werks/5430 @@ -0,0 +1,11 @@ +Title: Pause page reloads when selecting timerange by using the graph previews +Level: 1 +Component: metrics +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1509623611 + +

6 years, 11 months

Make "badness" notion of host/service states explicit.

by Sven Panne

Module: check_mk Branch: master Commit: 1861058283dc0b28a9624d7ab4e9a7ed3a3eaca0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1861058283dc0b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 2 11:52:00 2017 +0100 Make "badness" notion of host/service states explicit. Change-Id: I89c5a7451dfed281785201525eee40aff68a54ae --- livestatus/src/HostListStateColumn.cc | 25 +++++-------------------- livestatus/src/LogEntry.h | 26 ++++++++++++++++++++++++++ livestatus/src/ServiceListStateColumn.cc | 23 +++-------------------- livestatus/src/ServiceListStateColumn.h | 2 -- 4 files changed, 34 insertions(+), 42 deletions(-) diff --git a/livestatus/src/HostListStateColumn.cc b/livestatus/src/HostListStateColumn.cc index b1acd56..a91576d 100644 --- a/livestatus/src/HostListStateColumn.cc +++ b/livestatus/src/HostListStateColumn.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "HostListStateColumn.h" +#include "LogEntry.h" #include "Row.h" #include "auth.h" @@ -40,24 +41,6 @@ int32_t HostListStateColumn::getValue(Row row, const contact *auth_user) const { return result; } -namespace { -bool hst_state_is_worse(int32_t state1, int32_t state2) { - if (state1 == 0) { - return false; // UP is worse than nothing - } - if (state2 == 0) { - return true; // everything else is worse then UP - } - if (state2 == 1) { - return false; // nothing is worse than DOWN - } - if (state1 == 1) { - return true; // state1 is DOWN, state2 not - } - return false; // both are UNREACHABLE -} -} // namespace - void HostListStateColumn::update(host *hst, const contact *auth_user, int32_t &result) const { switch (_logictype) { @@ -76,7 +59,8 @@ void HostListStateColumn::update(host *hst, const contact *auth_user, int state = ServiceListStateColumn::getValueFromServices( _mc, static_cast<ServiceListStateColumn::Type>(_logictype), hst->services, auth_user); - if (ServiceListStateColumn::svcStateIsWorse(state, result)) { + if (worse(static_cast<ServiceState>(state), + static_cast<ServiceState>(result))) { result = state; } break; @@ -104,7 +88,8 @@ void HostListStateColumn::update(host *hst, const contact *auth_user, break; case Type::worst_hst_state: - if (hst_state_is_worse(hst->current_state, result)) { + if (worse(static_cast<HostState>(hst->current_state), + static_cast<HostState>(result))) { result = hst->current_state; } break; diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index 0d56ea7..1d46973 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -35,8 +35,34 @@ enum class ServiceState { ok = 0, warning = 1, critical = 2, unknown = 3 }; +inline double badness(ServiceState state) { + // unknown is effectively between warning and critical + return state == ServiceState::unknown + ? (static_cast<double>(ServiceState::warning) + + static_cast<double>(ServiceState::critical)) / + 2.0 + : static_cast<double>(state); +} + +inline bool worse(ServiceState state1, ServiceState state2) { + return badness(state1) > badness(state2); +} + enum class HostState { up = 0, down = 1, unreachable = 2 }; +inline double badness(HostState state) { + // unreachable is effectively between up and down + return state == HostState::unreachable + ? (static_cast<double>(HostState::up) + + static_cast<double>(HostState::down)) / + 2.0 + : static_cast<double>(state); +} + +inline bool worse(HostState state1, HostState state2) { + return badness(state1) > badness(state2); +} + enum class LogEntryType { none, alert_host, diff --git a/livestatus/src/ServiceListStateColumn.cc b/livestatus/src/ServiceListStateColumn.cc index 0b04681..6014341 100644 --- a/livestatus/src/ServiceListStateColumn.cc +++ b/livestatus/src/ServiceListStateColumn.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "ServiceListStateColumn.h" +#include "LogEntry.h" #include "Row.h" #include "auth.h" @@ -51,25 +52,6 @@ int32_t ServiceListStateColumn::getValueFromServices(MonitoringCore *mc, return result; } -// return true if state1 is worse than state2 - -// static -bool ServiceListStateColumn::svcStateIsWorse(int32_t state1, int32_t state2) { - if (state1 == 0) { - return false; // OK is worse than nothing - } - if (state2 == 0) { - return true; // everything else is worse then OK - } - if (state2 == 2) { - return false; // nothing is worse than CRIT - } - if (state1 == 2) { - return true; // state1 is CRIT, state2 not - } - return (state1 > state2); // both or WARN or UNKNOWN -} - // static void ServiceListStateColumn::update(Type logictype, service *svc, int32_t &result) { @@ -84,7 +66,8 @@ void ServiceListStateColumn::update(Type logictype, service *svc, } switch (lt) { case Type::worst_state: - if (svcStateIsWorse(service_state, result)) { + if (worse(static_cast<ServiceState>(service_state), + static_cast<ServiceState>(result))) { result = service_state; } break; diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index 41cb199..23d5557 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -78,8 +78,6 @@ public: service_list mem, const contact *auth_user); - static bool svcStateIsWorse(int32_t state1, int32_t state2); - private: MonitoringCore *_mc; const Type _logictype;

6 years, 11 months

5409 FIX Windows eventlog: wrong last state saved

by Jukka Aro

Module: check_mk Branch: master Commit: 33281d4ab0f81e1850669c0d9624aefcd610f3ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33281d4ab0f81e… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Oct 30 16:20:38 2017 +0100 5409 FIX Windows eventlog: wrong last state saved The initial run of Windows agent after fresh installation caused an incorrect last state to be written in the state file eventstate.txt. As a result, no new entries were read from the eventlog. Broken since commit 9619c43a171b7e9258f012f547c1d186660c6268. Change-Id: I47378f667b7ecf8c481f7ed9c7105623b4051a2b --- .werks/5409 | 16 ++++++++++++++++ agents/windows/EventLog.cc | 24 ++++++++++++++++++------ agents/windows/EventLog.h | 7 ++++++- agents/windows/EventLogVista.cc | 23 ++++++++++++++++++++--- agents/windows/EventLogVista.h | 4 +++- agents/windows/IEventLog.h | 19 ++++++++++++++----- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 10 ++++++++-- 8 files changed, 86 insertions(+), 19 deletions(-) diff --git a/.werks/5409 b/.werks/5409 new file mode 100644 index 0000000..39cdf54 --- /dev/null +++ b/.werks/5409 @@ -0,0 +1,16 @@ +Title: Windows eventlog: wrong last state saved +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1509376514 + +The initial run of Windows agent after fresh installation caused an +incorrect last state to be written in the state file eventstate.txt. +As a result, no new entries were read from the eventlog. Broken since +commit 91797ac9f7d69fc94119c08ea0df4baccaea2b6. + + diff --git a/agents/windows/EventLog.cc b/agents/windows/EventLog.cc index a840d24..8fb0d50 100644 --- a/agents/windows/EventLog.cc +++ b/agents/windows/EventLog.cc @@ -297,23 +297,23 @@ void EventLog::reset() { wstring EventLog::getName() const { return _name; } -uint64_t EventLog::seek(uint64_t record_number) { +void EventLog::seek(uint64_t record_number) { DWORD oldest_record, record_count; if (_log.GetOldestEventLogRecord(&oldest_record) && (record_number < oldest_record)) { - // can't seek to older record + // Beyond the oldest record: _record_offset = oldest_record; } else if (_log.GetNumberOfEventLogRecords(&record_count) && - (record_number > oldest_record + record_count)) { + (record_number >= oldest_record + record_count)) { + // Beyond the newest record. Note: set offset intentionally to the next + // record after the currently last one! _record_offset = oldest_record + record_count; } else { - // not actually seeking but storing for the next actual read + // Within bounds, the offset for the next actual read: _record_offset = record_number; } _buffer_offset = _buffer_used; // enforce that a new chunk is fetched - - return _record_offset; } std::unique_ptr<IEventLogRecord> EventLog::read() { @@ -351,6 +351,18 @@ std::unique_ptr<IEventLogRecord> EventLog::read() { } } +uint64_t EventLog::getLastRecordId() { + DWORD oldestRecord = 0; + DWORD recordCount = 0; + if (_log.GetOldestEventLogRecord(&oldestRecord) && + _log.GetNumberOfEventLogRecords(&recordCount) && + oldestRecord + recordCount > 0) { + return oldestRecord + recordCount - 1; + } else { + return 0; + } +} + bool EventLog::fillBuffer() { _buffer_offset = 0; diff --git a/agents/windows/EventLog.h b/agents/windows/EventLog.h index eb063fc..cab226b 100644 --- a/agents/windows/EventLog.h +++ b/agents/windows/EventLog.h @@ -149,7 +149,7 @@ public: * In this case this function will still work as expected but the next read * will be slow. */ - virtual uint64_t seek(uint64_t record_id) override; + virtual void seek(uint64_t record_id) override; /** * read the next eventlog record @@ -160,6 +160,11 @@ public: virtual std::unique_ptr<IEventLogRecord> read() override; /** + * return the ID of the last record in eventlog + */ + virtual uint64_t getLastRecordId() override; + + /** * get a list of dlls that contain eventid->message mappings for this * eventlog and the specified source */ diff --git a/agents/windows/EventLogVista.cc b/agents/windows/EventLogVista.cc index 1b73e1a..b93bada 100644 --- a/agents/windows/EventLogVista.cc +++ b/agents/windows/EventLogVista.cc @@ -338,7 +338,7 @@ std::wstring EventLogVista::renderBookmark(EVT_HANDLE bookmark) const { return buffer; } -uint64_t EventLogVista::seek(uint64_t record_id) { +void EventLogVista::seek(uint64_t record_id) { { // The api to retrieve the oldest event log id is bugged. bloody hell... // to get the right offset if record_id is beyond the valid range, we @@ -410,8 +410,6 @@ uint64_t EventLogVista::seek(uint64_t record_id) { throw win_exception( _winapi, std::string("failed to subscribe to ") + to_utf8(_path)); } - - return record_id; } std::unique_ptr<IEventLogRecord> EventLogVista::read() { @@ -425,6 +423,25 @@ std::unique_ptr<IEventLogRecord> EventLogVista::read() { _winapi); } +uint64_t EventLogVista::getLastRecordId() { + auto log = std::make_unique<EventLogWrapper>( + *_evt, EvtQueryReverseDirection, _path, _winapi); + + EVT_HANDLE event_handle = nullptr; + DWORD num_events = 0; + if (evt().next && + evt().next(log->get_handle(), 1, &event_handle, INFINITE, 0, + &num_events)) { + auto event = std::make_unique<ManagedEventHandle>(*_evt, event_handle); + + return EventLogRecordVista(event->get_handle(), _evt.get(), + _render_context->get_handle(), _winapi) + .recordId(); + } else { + return 0; + } +} + bool EventLogVista::fillBuffer() { // this ensures all previous event handles are closed and nulled reset(); diff --git a/agents/windows/EventLogVista.h b/agents/windows/EventLogVista.h index de9195f..bbea22f 100644 --- a/agents/windows/EventLogVista.h +++ b/agents/windows/EventLogVista.h @@ -150,10 +150,12 @@ public: virtual void reset() override; - virtual uint64_t seek(uint64_t record_id) override; + virtual void seek(uint64_t record_id) override; virtual std::unique_ptr<IEventLogRecord> read() override; + virtual uint64_t getLastRecordId() override; + private: static const int EVENT_BLOCK_SIZE = 16; diff --git a/agents/windows/IEventLog.h b/agents/windows/IEventLog.h index 10d7df0..ebeb25c 100644 --- a/agents/windows/IEventLog.h +++ b/agents/windows/IEventLog.h @@ -70,13 +70,17 @@ public: * seek to the specified record on the next read or, if the record_number is * older than the oldest existing record, seek to the beginning. If the * record_number is the highest representable uint32_t, seek to the end of - * the log such that only future events are retrieveda + * the log such that only future events are retrieved * - * returns the actual record_id we seeked to, which may differ from the - * input - * if it was outside the available range + * WARNING: + * The implementations for pre-Vista and post-Vista are completely + * different. + * We *must not* return any value as it is different between pre/post Vista. + * For obtaining the ID of the last record in eventlog, please use + * getLastRecordId instead. It has own implementations for pre/post Vista + * but return a uniformly correct value. */ - virtual uint64_t seek(uint64_t record_id) = 0; + virtual void seek(uint64_t record_id) = 0; /** * read the next eventlog record @@ -87,6 +91,11 @@ public: virtual std::unique_ptr<IEventLogRecord> read() = 0; /** + * return the ID of the last record in eventlog + */ + virtual uint64_t getLastRecordId() = 0; + + /** * get a list of dlls that contain eventid->message mappings for this * eventlog and the specified source */ diff --git a/agents/windows/build_version b/agents/windows/build_version index ce89b3e..47efd9a 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2992 +2994 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 9e6f79d..773e3d4 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -166,6 +166,9 @@ std::pair<uint64_t, int> processEventLog( previouslyReadId + (uint64limits::max() == previouslyReadId ? 0 : 1); int worstState = 0; uint64_t lastRecordId = previouslyReadId; + // WARNING: + // seek implementations for pre-Vista and post-Vista are completely different. + // seek *must not* return any value as it is different between pre/post Vista. log.seek(seekPosition); while (auto record = std::move(log.read())) { lastRecordId = record->recordId(); @@ -210,8 +213,11 @@ uint64_t SectionEventlog::outputEventlog(std::ostream &out, const char *logname, }; processEventLog(*log, previouslyReadId, level, outputRecord); } - - return lastReadId; + // Return the last entry number. We need to fetch the last record ID + // separately if INT_MAX was used as seek offset and no new entries + // were read. + return (std::numeric_limits<uint64_t>::max() == lastReadId) ? + log->getLastRecordId() : lastReadId; } } catch (const std::exception &e) { Error(_logger) << "failed to read event log: " << e.what() << std::endl;

6 years, 11 months

Various simplifications.

by Sven Panne

Module: check_mk Branch: master Commit: fd43b100d02c3e3de93550a41dca39f92895384a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd43b100d02c3e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 2 10:31:38 2017 +0100 Various simplifications. Change-Id: I4eec71bae9f8bd93cd2bc3642305afa8a6cdbb2e --- livestatus/src/HostListStateColumn.cc | 42 ++++++++++++-------------- livestatus/src/HostListStateColumn.h | 8 +---- livestatus/src/ServiceListStateColumn.cc | 52 ++++++++++++++++---------------- livestatus/src/ServiceListStateColumn.h | 15 +++++---- 4 files changed, 55 insertions(+), 62 deletions(-) diff --git a/livestatus/src/HostListStateColumn.cc b/livestatus/src/HostListStateColumn.cc index a3d5002..b1acd56 100644 --- a/livestatus/src/HostListStateColumn.cc +++ b/livestatus/src/HostListStateColumn.cc @@ -26,7 +26,22 @@ #include "Row.h" #include "auth.h" -static inline bool hst_state_is_worse(int32_t state1, int32_t state2) { +int32_t HostListStateColumn::getValue(Row row, const contact *auth_user) const { + int32_t result = 0; + if (auto p = columnData<hostsmember *>(row)) { + for (hostsmember *mem = *p; mem != nullptr; mem = mem->next) { + host *hst = mem->host_ptr; + if (auth_user == nullptr || + is_authorized_for(_mc, auth_user, hst, nullptr)) { + update(hst, auth_user, result); + } + } + } + return result; +} + +namespace { +bool hst_state_is_worse(int32_t state1, int32_t state2) { if (state1 == 0) { return false; // UP is worse than nothing } @@ -41,27 +56,8 @@ static inline bool hst_state_is_worse(int32_t state1, int32_t state2) { } return false; // both are UNREACHABLE } +} // namespace -hostsmember *HostListStateColumn::getMembers(Row row) const { - if (auto p = columnData<hostsmember *>(row)) { - return *p; - } - return nullptr; -} - -int32_t HostListStateColumn::getValue(Row row, const contact *auth_user) const { - int32_t result = 0; - for (hostsmember *mem = getMembers(row); mem != nullptr; mem = mem->next) { - host *hst = mem->host_ptr; - if (auth_user == nullptr || - is_authorized_for(_mc, auth_user, hst, nullptr)) { - update(hst, auth_user, result); - } - } - return result; -} - -// static void HostListStateColumn::update(host *hst, const contact *auth_user, int32_t &result) const { switch (_logictype) { @@ -71,13 +67,13 @@ void HostListStateColumn::update(host *hst, const contact *auth_user, case Type::num_svc_crit: case Type::num_svc_unknown: case Type::num_svc: - result += ServiceListStateColumn::getValue( + result += ServiceListStateColumn::getValueFromServices( _mc, static_cast<ServiceListStateColumn::Type>(_logictype), hst->services, auth_user); break; case Type::worst_svc_state: { - int state = ServiceListStateColumn::getValue( + int state = ServiceListStateColumn::getValueFromServices( _mc, static_cast<ServiceListStateColumn::Type>(_logictype), hst->services, auth_user); if (ServiceListStateColumn::svcStateIsWorse(state, result)) { diff --git a/livestatus/src/HostListStateColumn.h b/livestatus/src/HostListStateColumn.h index dfa17a5..187c094 100644 --- a/livestatus/src/HostListStateColumn.h +++ b/livestatus/src/HostListStateColumn.h @@ -34,9 +34,7 @@ class MonitoringCore; class Row; #ifdef CMC -#include <unordered_set> #include "cmc.h" -class Host; #else #include "nagios.h" #endif @@ -81,12 +79,8 @@ public: extra_extra_offset, offset) , _mc(mc) , _logictype(logictype) {} + int32_t getValue(Row row, const contact *auth_user) const override; -#ifdef CMC - const std::unordered_set<Host *> *getMembers(Row row) const; -#else - hostsmember *getMembers(Row row) const; -#endif private: MonitoringCore *_mc; diff --git a/livestatus/src/ServiceListStateColumn.cc b/livestatus/src/ServiceListStateColumn.cc index fa1f368..0b04681 100644 --- a/livestatus/src/ServiceListStateColumn.cc +++ b/livestatus/src/ServiceListStateColumn.cc @@ -26,34 +26,20 @@ #include "Row.h" #include "auth.h" -// return true if state1 is worse than state2 -bool ServiceListStateColumn::svcStateIsWorse(int32_t state1, int32_t state2) { - if (state1 == 0) { - return false; // OK is worse than nothing - } - if (state2 == 0) { - return true; // everything else is worse then OK - } - if (state2 == 2) { - return false; // nothing is worse than CRIT - } - if (state1 == 2) { - return true; // state1 is CRIT, state2 not - } - return (state1 > state2); // both or WARN or UNKNOWN -} - -servicesmember *ServiceListStateColumn::getMembers(Row row) const { +int32_t ServiceListStateColumn::getValue(Row row, + const contact *auth_user) const { + servicesmember *mem = nullptr; if (auto p = columnData<servicesmember *>(row)) { - return *p; + mem = *p; } - return nullptr; + return getValueFromServices(_mc, _logictype, mem, auth_user); } // static -int32_t ServiceListStateColumn::getValue(MonitoringCore *mc, Type logictype, - servicesmember *mem, - const contact *auth_user) { +int32_t ServiceListStateColumn::getValueFromServices(MonitoringCore *mc, + Type logictype, + servicesmember *mem, + const contact *auth_user) { int32_t result = 0; for (; mem != nullptr; mem = mem->next) { service *svc = mem->service_ptr; @@ -65,9 +51,23 @@ int32_t ServiceListStateColumn::getValue(MonitoringCore *mc, Type logictype, return result; } -int32_t ServiceListStateColumn::getValue(Row row, - const contact *auth_user) const { - return getValue(_mc, _logictype, getMembers(row), auth_user); +// return true if state1 is worse than state2 + +// static +bool ServiceListStateColumn::svcStateIsWorse(int32_t state1, int32_t state2) { + if (state1 == 0) { + return false; // OK is worse than nothing + } + if (state2 == 0) { + return true; // everything else is worse then OK + } + if (state2 == 2) { + return false; // nothing is worse than CRIT + } + if (state1 == 2) { + return true; // state1 is CRIT, state2 not + } + return (state1 > state2); // both or WARN or UNKNOWN } // static diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index 21d98a6..41cb199 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -65,16 +65,19 @@ public: extra_extra_offset, offset) , _mc(mc) , _logictype(logictype) {} + int32_t getValue(Row row, const contact *auth_user) const override; + #ifdef CMC - static int32_t getValue(MonitoringCore *mc, Type logictype, - const Host::services_t *mem, - const contact *auth_user); + using service_list = const Host::services_t *; #else - static int32_t getValue(MonitoringCore *mc, Type logictype, - servicesmember *mem, const contact *auth_user); - servicesmember *getMembers(Row row) const; + using service_list = servicesmember *; #endif + + static int32_t getValueFromServices(MonitoringCore *mc, Type logictype, + service_list mem, + const contact *auth_user); + static bool svcStateIsWorse(int32_t state1, int32_t state2); private:

6 years, 11 months

Updated some werk levels / components

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b34e2b9428d00e28deb1ca8dc92ef8ef4f45726 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b34e2b9428d00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 2 09:07:38 2017 +0100 Updated some werk levels / components Change-Id: Ib307d8032f406771764d2376fc0614323be2a5ed --- .werks/3920 | 2 +- .werks/4840 | 2 +- .werks/4977 | 2 +- .werks/5044 | 2 +- .werks/5213 | 2 +- .werks/5231 | 2 +- .werks/5343 | 2 +- .werks/5363 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.werks/3920 b/.werks/3920 index e4cbcf1..014dc5e 100644 --- a/.werks/3920 +++ b/.werks/3920 @@ -1,6 +1,6 @@ Title: Graphs: Vertical axis scaling and mirroring can now be customized Level: 2 -Component: multisite +Component: metrics Compatible: compat Edition: cee Version: 1.5.0i1 diff --git a/.werks/4840 b/.werks/4840 index e4e955d..ed3f647 100644 --- a/.werks/4840 +++ b/.werks/4840 @@ -1,5 +1,5 @@ Title: Check parameters can now be bound to timeperiods -Level: 1 +Level: 2 Component: wato Compatible: compat Edition: cre diff --git a/.werks/4977 b/.werks/4977 index 66af248..67da4ee 100644 --- a/.werks/4977 +++ b/.werks/4977 @@ -1,6 +1,6 @@ Title: Improved displaying a large number of contact groups in folder/host properties Level: 1 -Component: multisite +Component: wato Compatible: compat Edition: cre Version: 1.5.0i1 diff --git a/.werks/5044 b/.werks/5044 index badbb9b..78d50db 100644 --- a/.werks/5044 +++ b/.werks/5044 @@ -1,6 +1,6 @@ Title: LDAP: Active Directory connection try to discover the nearest DC now Level: 1 -Component: multisite +Component: wato Compatible: compat Edition: cre Version: 1.5.0i1 diff --git a/.werks/5213 b/.werks/5213 index f613ea9..8bdb311 100644 --- a/.werks/5213 +++ b/.werks/5213 @@ -1,6 +1,6 @@ Title: Global settings can now be filtered to show only modified settings Level: 1 -Component: multisite +Component: wato Compatible: compat Edition: cre Version: 1.5.0i1 diff --git a/.werks/5231 b/.werks/5231 index cb63c4e..4e4f82f 100644 --- a/.werks/5231 +++ b/.werks/5231 @@ -1,5 +1,5 @@ Title: Distributed WATO: Improved site snapshot generation speed, reduces "Activate changes" duration -Level: 1 +Level: 2 Component: wato Class: feature Compatible: compat diff --git a/.werks/5343 b/.werks/5343 index ccd1a98..c3d6258 100644 --- a/.werks/5343 +++ b/.werks/5343 @@ -1,6 +1,6 @@ Title: Bulk import for custom attributes of hosts Level: 1 -Component: multisite +Component: wato Compatible: compat Edition: cre Version: 1.5.0i1 diff --git a/.werks/5363 b/.werks/5363 index d1b562d..21f1162 100644 --- a/.werks/5363 +++ b/.werks/5363 @@ -1,6 +1,6 @@ Title: Exporting graph data in JSON format via GUI is now possible Level: 2 -Component: multisite +Component: metrics Compatible: compat Edition: cee Version: 1.5.0i1

6 years, 11 months

5429 FIX Fixed broken event history expiration ( when using default settings)

by Lars Michelsen

Module: check_mk Branch: master Commit: f7f576c7f1e3c3e0ba53e358ef96263b91d97628 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7f576c7f1e3c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 2 11:33:22 2017 +0100 5429 FIX Fixed broken event history expiration (when using default settings) The Event Console was not deleting outdated entries from the event history. With the default settings it is intended to delete entries older than 365 days from the EC archive. This did not work. A message like this can be found each "Housekeeping interval", normaly 1 minute: [1509618281.352829] Error expiring log files: year out of range This time window can be configured with the setting "Event history lifetime". As a workaround you can simply open this setting and save it with the default value. This will make the event deletion work as expected. When you are affected, this may result in a way too huge Event Console archive directory (<tt>~/var/mkeventd/history</tt>) which may result in slow "Event Console History" views (depends on your filtering). You could clean up the archive directory by hand to improve the situation. After applying the update, the next housekeeping run will clean up all your old archived events. Change-Id: Ie00346286eee239377b2c38c2e2c05b757084e7a --- .werks/5429 | 29 +++++++++++++++++++++++++++++ bin/mkeventd | 23 +++++++++++++++++------ lib/event_console.py | 2 +- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/.werks/5429 b/.werks/5429 new file mode 100644 index 0000000..abf304a --- /dev/null +++ b/.werks/5429 @@ -0,0 +1,29 @@ +Title: Fixed broken event history expiration (when using default settings) +Level: 2 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1509618033 + +The Event Console was not deleting outdated entries from the event history. +With the default settings it is intended to delete entries older than 365 +days from the EC archive. This did not work. + +A message like this can be found each "Housekeeping interval", normaly 1 minute: + +[1509618281.352829] Error expiring log files: year out of range + +This time window can be configured with the setting "Event history lifetime". +As a workaround you can simply open this setting and save it with the default +value. This will make the event deletion work as expected. + +When you are affected, this may result in a way too huge Event Console archive +directory (<tt>~/var/mkeventd/history</tt>) which may result in slow +"Event Console History" views (depends on your filtering). You could clean up +the archive directory by hand to improve the situation. + +After applying the update, the next housekeeping run will clean up all your old +archived events. diff --git a/bin/mkeventd b/bin/mkeventd index 4071499..c384398 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -55,6 +55,7 @@ import cmk.paths import cmk.defines as defines import cmk.daemon import cmk.event_console +import cmk.render import cmk.profile from cmk.regex import regex, is_regex @@ -744,7 +745,7 @@ def update_mongodb_history_lifetime(): if not g_mongo_conn: connect_mongodb() - if get_mongodb_max_history_age() == g_config['history_lifetime']: + if get_mongodb_max_history_age() == g_config['history_lifetime'] * 86400: return # do not update already correct index try: @@ -754,7 +755,7 @@ def update_mongodb_history_lifetime(): # Delete messages after x days g_mongo_db.ec_archive.ensure_index([('dt', DESCENDING)], - expireAfterSeconds = g_config['history_lifetime'], + expireAfterSeconds = g_config['history_lifetime'] * 86400, unique = False ) @@ -970,16 +971,26 @@ def expire_logfiles(flush = False): try: now = time.time() min_mtime = now - g_config["history_lifetime"] * 86400 + + logger.verbose("Expiring logfiles (Horizon: %d days -> %s)" % + (g_config["history_lifetime"], cmk.render.date_and_time(min_mtime))) + for fn in os.listdir(log_dir): if fn.endswith(".log"): path = log_dir + "/" + fn + if flush: logger.info("Flushed log file %s" % path) os.remove(path) - elif os.stat(path).st_mtime < min_mtime: - logger.info("Deleting log file %s (lifetime expired after %d days)" % - (path, g_config["history_lifetime"])) - os.remove(path) + + else: + file_mtime = os.stat(path).st_mtime + + if file_mtime < min_mtime: + logger.info("Deleting log file %s (age %s)" % + (path, cmk.render.date_and_time(file_mtime))) + os.remove(path) + except Exception as e: if opt_debug: raise diff --git a/lib/event_console.py b/lib/event_console.py index d8fd006..eefe2a7 100644 --- a/lib/event_console.py +++ b/lib/event_console.py @@ -48,7 +48,7 @@ def default_config(): "retention_interval": 60, "housekeeping_interval": 60, "statistics_interval": 5, - "history_lifetime": 365 * 24 * 3600, + "history_lifetime": 365, # days "history_rotation": "daily", "replication": None, "remote_status": None,

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017