Module: check_mk Branch: master Commit: 90d51fb1155f054e421c8b3978d267f2fe4ef672 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90d51fb1155f05… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Mon Mar 5 11:27:37 2018 +0100 The NEB's disable_statehist_filtering option is a no-op now. We always use filtering now, similar code is in the CMC for ages, and the option was totally untested. The removal of this code path opens up chances for removing some copy-n-paste. Change-Id: I3d6ddd9ec4633bc91c9d96ec262436ce0314b746 --- livestatus/src/MonitoringCore.h | 1 - livestatus/src/TableStateHistory.cc | 13 +++++-------- livestatus/src/module.cc | 7 ++----- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 68b81bb..88666bb 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -95,7 +95,6 @@ public: virtual Encoding dataEncoding() = 0; virtual size_t maxResponseSize() = 0; virtual size_t maxCachedMessages() = 0; - virtual bool stateHistoryFilteringEnabled() = 0; virtual AuthorizationKind hostAuthorization() const = 0; virtual AuthorizationKind serviceAuthorization() const = 0; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 042b831..89be3cc 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -40,7 +40,6 @@ #include "HostServiceState.h" #include "LogEntry.h" #include "Logger.h" -#include "MonitoringCore.h" #include "OffsetDoubleColumn.h" #include "OffsetIntColumn.h" #include "OffsetSStringColumn.h" @@ -286,13 +285,11 @@ void TableStateHistory::answerQuery(Query *query) { // Create a partial filter, that contains only such filters that check // attributes of current hosts and services std::vector<std::unique_ptr<Filter>> subfilters; - if (core()->stateHistoryFilteringEnabled()) { - for (const auto &filter : *query->filter()) { - IsObjectFilter is_obj; - filter->accept(is_obj); - if (is_obj._value) { - subfilters.push_back(filter->copy()); - } + for (const auto &filter : *query->filter()) { + IsObjectFilter is_obj; + filter->accept(is_obj); + if (is_obj._value) { + subfilters.push_back(filter->copy()); } } std::reverse(subfilters.begin(), subfilters.end()); diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 5bac8be..bf50124 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -89,7 +89,6 @@ int g_num_queued_connections = 0; // current number of active connections (for statistics) std::atomic_int32_t g_livestatus_active_connections{0}; size_t g_thread_stack_size = 1024 * 1024; /* stack size of threads */ -static int fl_disable_statehist_filtering; void *g_nagios_handle; int g_unix_socket = -1; @@ -644,9 +643,6 @@ public: Encoding dataEncoding() override { return fl_data_encoding; } size_t maxResponseSize() override { return fl_max_response_size; } size_t maxCachedMessages() override { return fl_max_cached_messages; } - bool stateHistoryFilteringEnabled() override { - return fl_disable_statehist_filtering == 0; - } // TODO(sp) Unused in Livestatus NEB: Strange & ugly... AuthorizationKind hostAuthorization() const override { @@ -1045,7 +1041,8 @@ void livestatus_parse_arguments(const char *args_orig) { Warning(fl_logger_nagios) << "livecheck has been removed from Livestatus, sorry."; } else if (strcmp(left, "disable_statehist_filtering") == 0) { - fl_disable_statehist_filtering = atoi(right); + Warning(fl_logger_nagios) + << "the disable_statehist_filtering option has been removed, filtering is always active now."; } else { Warning(fl_logger_nagios) << "ignoring invalid option " << left << "=" << right;