tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RedisWriter: populate icinga:history:stream:*:comment

This commit is contained in:
Alexander A. Klimov 2019-10-02 15:53:52 +02:00 committed by Michael Friedrich
parent 6c536c97e8
commit 81873248e1
2 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/redis/rediswriter-objects.cpp
View File

@ -101,6 +101,9 @@ void RedisWriter::ConfigStaticInitialize()
) {
RedisWriter::NotificationSentToAllUsersHandler(notification, checkable, users, type, cr, author, text);
});
Comment::OnCommentAdded.connect(&RedisWriter::CommentAddedHandler);
Comment::OnCommentRemoved.connect(&RedisWriter::CommentRemovedHandler);
}
static std::pair<String, String> SplitOutput(String output)
@ -1297,6 +1300,43 @@ void RedisWriter::SendRemovedDowntime(const Downtime::Ptr& downtime)
m_Rcon->FireAndForgetQuery(std::move(xAdd));
}
void RedisWriter::SendAddedComment(const Comment::Ptr& comment)
{
auto service (dynamic_pointer_cast<Service>(comment->GetCheckable()));
m_Rcon->FireAndForgetQuery({
"XADD", service ? "icinga:history:stream:service:comment" : "icinga:history:stream:host:comment", "*",
"comment_id", GetObjectIdentifier(comment),
"environment_id", SHA1(GetEnvironment()),
service ? "service_id" : "host_id", GetObjectIdentifier(comment->GetCheckable()),
"entry_time", Convert::ToString(comment->GetEntryTime()),
"author", Utility::ValidateUTF8(comment->GetAuthor()),
"comment", Utility::ValidateUTF8(comment->GetText()),
"entry_type", Convert::ToString(comment->GetEntryType()),
"is_persistent", Convert::ToString((unsigned short)comment->GetPersistent()),
"expire_time", Convert::ToString(comment->GetExpireTime())
});
}
void RedisWriter::SendRemovedComment(const Comment::Ptr& comment)
{
auto service (dynamic_pointer_cast<Service>(comment->GetCheckable()));
m_Rcon->FireAndForgetQuery({
"XADD", service ? "icinga:history:stream:service:comment" : "icinga:history:stream:host:comment", "*",
"comment_id", GetObjectIdentifier(comment),
"environment_id", SHA1(GetEnvironment()),
service ? "service_id" : "host_id", GetObjectIdentifier(comment->GetCheckable()),
"entry_time", Convert::ToString(comment->GetEntryTime()),
"author", Utility::ValidateUTF8(comment->GetAuthor()),
"comment", Utility::ValidateUTF8(comment->GetText()),
"entry_type", Convert::ToString(comment->GetEntryType()),
"is_persistent", Convert::ToString((unsigned short)comment->GetPersistent()),
"expire_time", Convert::ToString(comment->GetExpireTime()),
"deletion_time", Convert::ToString(Utility::GetTime())
});
}
Dictionary::Ptr RedisWriter::SerializeState(const Checkable::Ptr& checkable)
{
Dictionary::Ptr attrs = new Dictionary();
@ -1507,3 +1547,17 @@ void RedisWriter::NotificationSentToAllUsersHandler(
}
}
}
void RedisWriter::CommentAddedHandler(const Comment::Ptr& comment)
{
for (auto& rw : ConfigType::GetObjectsByType<RedisWriter>()) {
rw->m_WorkQueue.Enqueue([rw, comment]() { rw->SendAddedComment(comment); });
}
}
void RedisWriter::CommentRemovedHandler(const Comment::Ptr& comment)
{
for (auto& rw : ConfigType::GetObjectsByType<RedisWriter>()) {
rw->m_WorkQueue.Enqueue([rw, comment]() { rw->SendRemovedComment(comment); });
}
}

5
lib/redis/rediswriter.hpp
View File

@ -89,6 +89,8 @@ private:
void SendStartedDowntime(const Downtime::Ptr& downtime);
void SendRemovedDowntime(const Downtime::Ptr& downtime);
void SendAddedComment(const Comment::Ptr& comment);
void SendRemovedComment(const Comment::Ptr& comment);
std::vector<String> UpdateObjectAttrs(const ConfigObject::Ptr& object, int fieldType, const String& typeNameOverride);
Dictionary::Ptr SerializeState(const Checkable::Ptr& checkable);
@ -126,6 +128,9 @@ private:
NotificationType type, const CheckResult::Ptr& cr, const String& author, const String& text
);
static void CommentAddedHandler(const Comment::Ptr& comment);
static void CommentRemovedHandler(const Comment::Ptr& comment);
void AssertOnWorkQueue();
void ExceptionHandler(boost::exception_ptr exp);