From df7184ad64371664420a54e3e253b8c646bde855 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Wed, 27 Nov 2019 13:13:58 +0100 Subject: [PATCH] IcingaDB: populate icinga:nextupdate:* --- lib/icingadb/icingadb-objects.cpp | 69 +++++++++++++++++++++++++++++++ lib/icingadb/icingadb.hpp | 2 + lib/icingadb/redisconnection.hpp | 3 +- 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/lib/icingadb/icingadb-objects.cpp b/lib/icingadb/icingadb-objects.cpp index 1971f8030..8574aaeef 100644 --- a/lib/icingadb/icingadb-objects.cpp +++ b/lib/icingadb/icingadb-objects.cpp @@ -90,6 +90,10 @@ void IcingaDB::ConfigStaticInitialize() Comment::OnCommentRemoved.connect(&IcingaDB::CommentRemovedHandler); Checkable::OnFlappingChanged.connect(&IcingaDB::FlappingChangedHandler); + + Checkable::OnNewCheckResult.connect([](const Checkable::Ptr& checkable, const CheckResult::Ptr&, const MessageOrigin::Ptr&) { + IcingaDB::NewCheckResultHandler(checkable); + }); } void IcingaDB::UpdateAllConfigObjects() @@ -121,6 +125,7 @@ void IcingaDB::UpdateAllConfigObjects() m_PrefixConfigObject + "icon_image", }; DeleteKeys(globalKeys, Prio::Config); + DeleteKeys({"icinga:nextupdate:host", "icinga:nextupdate:service"}, Prio::CheckResult); upq.ParallelFor(types, [this](const TypePair& type) { String lcType = type.second; @@ -137,6 +142,7 @@ void IcingaDB::UpdateAllConfigObjects() std::map> hMSets, publishes; std::vector states = {"HMSET", m_PrefixStateObject + lcType}; std::vector > transaction = {{"MULTI"}}; + std::vector hostZAdds = {"ZADD", "icinga:nextupdate:host"}, serviceZAdds = {"ZADD", "icinga:nextupdate:service"}; bool dumpState = (lcType == "host" || lcType == "service"); @@ -189,6 +195,23 @@ void IcingaDB::UpdateAllConfigObjects() transaction = {{"MULTI"}}; } } + + auto checkable (dynamic_pointer_cast(object)); + + if (checkable) { + auto zAdds (dynamic_pointer_cast(checkable) ? &serviceZAdds : &hostZAdds); + + zAdds->emplace_back(Convert::ToString(checkable->GetNextUpdate())); + zAdds->emplace_back(GetObjectIdentifier(checkable)); + + if (zAdds->size() >= 102u) { + std::vector header (zAdds->begin(), zAdds->begin() + 2u); + + m_Rcon->FireAndForgetQuery(std::move(*zAdds), Prio::CheckResult); + + *zAdds = std::move(header); + } + } } for (auto& kv : hMSets) { @@ -219,6 +242,12 @@ void IcingaDB::UpdateAllConfigObjects() m_Rcon->FireAndForgetQueries(std::move(transaction), Prio::Config); } + for (auto zAdds : {&hostZAdds, &serviceZAdds}) { + if (zAdds->size() > 2u) { + m_Rcon->FireAndForgetQuery(std::move(*zAdds), Prio::CheckResult); + } + } + Log(LogNotice, "IcingaDB") << "Dumped " << bulkCounter << " objects of type " << type.second; }); @@ -757,6 +786,10 @@ void IcingaDB::SendConfigUpdate(const ConfigObject::Ptr& object, bool runtimeUpd transaction.push_back({"EXEC"}); m_Rcon->FireAndForgetQueries(std::move(transaction), Prio::Config); } + + if (checkable) { + SendNextUpdate(checkable); + } } // Takes object and collects IcingaDB relevant attributes and computes checksums. Returns whether the object is relevant @@ -1076,6 +1109,19 @@ void IcingaDB::SendConfigDelete(const ConfigObject::Ptr& object) {"DEL", m_PrefixStateObject + typeName + ":" + objectKey}, {"PUBLISH", "icinga:config:delete", typeName + ":" + objectKey} }, Prio::Config); + + auto checkable (dynamic_pointer_cast(object)); + + if (checkable) { + m_Rcon->FireAndForgetQuery( + { + "ZREM", + dynamic_pointer_cast(checkable) ? "icinga:nextupdate:service" : "icinga:nextupdate:host", + GetObjectIdentifier(checkable) + }, + Prio::CheckResult + ); + } } static inline @@ -1556,6 +1602,22 @@ void IcingaDB::SendFlappingChanged(const Checkable::Ptr& checkable, const Value& m_Rcon->FireAndForgetQuery(std::move(xAdd), Prio::History); } +void IcingaDB::SendNextUpdate(const Checkable::Ptr& checkable) +{ + if (!m_Rcon || !m_Rcon->IsConnected()) + return; + + m_Rcon->FireAndForgetQuery( + { + "ZADD", + dynamic_pointer_cast(checkable) ? "icinga:nextupdate:service" : "icinga:nextupdate:host", + Convert::ToString(checkable->GetNextUpdate()), + GetObjectIdentifier(checkable) + }, + Prio::CheckResult + ); +} + Dictionary::Ptr IcingaDB::SerializeState(const Checkable::Ptr& checkable) { Dictionary::Ptr attrs = new Dictionary(); @@ -1795,3 +1857,10 @@ void IcingaDB::FlappingChangedHandler(const Checkable::Ptr& checkable, const Val rw->m_WorkQueue.Enqueue([rw, checkable, value]() { rw->SendFlappingChanged(checkable, value); }); } } + +void IcingaDB::NewCheckResultHandler(const Checkable::Ptr& checkable) +{ + for (auto& rw : ConfigType::GetObjectsByType()) { + rw->m_WorkQueue.Enqueue([rw, checkable]() { rw->SendNextUpdate(checkable); }); + } +} diff --git a/lib/icingadb/icingadb.hpp b/lib/icingadb/icingadb.hpp index 8cca4e390..a1ae85c80 100644 --- a/lib/icingadb/icingadb.hpp +++ b/lib/icingadb/icingadb.hpp @@ -66,6 +66,7 @@ private: void SendAddedComment(const Comment::Ptr& comment); void SendRemovedComment(const Comment::Ptr& comment); void SendFlappingChanged(const Checkable::Ptr& checkable, const Value& value); + void SendNextUpdate(const Checkable::Ptr& checkable); std::vector UpdateObjectAttrs(const ConfigObject::Ptr& object, int fieldType, const String& typeNameOverride); Dictionary::Ptr SerializeState(const Checkable::Ptr& checkable); @@ -107,6 +108,7 @@ private: static void CommentAddedHandler(const Comment::Ptr& comment); static void CommentRemovedHandler(const Comment::Ptr& comment); static void FlappingChangedHandler(const Checkable::Ptr& checkable, const Value& value); + static void NewCheckResultHandler(const Checkable::Ptr& checkable); void AssertOnWorkQueue(); diff --git a/lib/icingadb/redisconnection.hpp b/lib/icingadb/redisconnection.hpp index 41ec3857f..a9767d408 100644 --- a/lib/icingadb/redisconnection.hpp +++ b/lib/icingadb/redisconnection.hpp @@ -56,7 +56,8 @@ namespace icinga Heartbeat, Config, State, - History + History, + CheckResult }; RedisConnection(const String& host, const int port, const String& path,