tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-10-30 18:53:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Icinga DB: no active checks? Not overdue!

Browse Source
This commit is contained in:
Alexander A. Klimov 2021-06-08 19:17:03 +02:00
parent 8b516f0c08
commit 9c567c0bde
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/icingadb/icingadb-objects.cpp
View File

@ -289,7 +289,7 @@ void IcingaDB::UpdateAllConfigObjects()
auto checkable (dynamic_pointer_cast<Checkable>(object)); auto checkable (dynamic_pointer_cast<Checkable>(object));
if (checkable) { if (checkable && checkable->GetEnableActiveChecks()) {
auto zAdds (dynamic_pointer_cast<Service>(checkable) ? &serviceZAdds : &hostZAdds); auto zAdds (dynamic_pointer_cast<Service>(checkable) ? &serviceZAdds : &hostZAdds);
zAdds->emplace_back(Convert::ToString(checkable->GetNextUpdate())); zAdds->emplace_back(Convert::ToString(checkable->GetNextUpdate()));
@ -1995,15 +1995,26 @@ void IcingaDB::SendNextUpdate(const Checkable::Ptr& checkable)
if (!m_Rcon || !m_Rcon->IsConnected()) if (!m_Rcon || !m_Rcon->IsConnected())
return; return;
m_Rcon->FireAndForgetQuery( if (checkable->GetEnableActiveChecks()) {
{ m_Rcon->FireAndForgetQuery(
"ZADD", {
dynamic_pointer_cast<Service>(checkable) ? "icinga:nextupdate:service" : "icinga:nextupdate:host", "ZADD",
Convert::ToString(checkable->GetNextUpdate()), dynamic_pointer_cast<Service>(checkable) ? "icinga:nextupdate:service" : "icinga:nextupdate:host",
GetObjectIdentifier(checkable) Convert::ToString(checkable->GetNextUpdate()),
}, GetObjectIdentifier(checkable)
Prio::CheckResult },
); Prio::CheckResult
);
} else {
m_Rcon->FireAndForgetQuery(
{
"ZREM",
dynamic_pointer_cast<Service>(checkable) ? "icinga:nextupdate:service" : "icinga:nextupdate:host",
GetObjectIdentifier(checkable)
},
Prio::CheckResult
);
}
} }
void IcingaDB::SendAcknowledgementSet(const Checkable::Ptr& checkable, const String& author, const String& comment, AcknowledgementType type, bool persistent, double changeTime, double expiry) void IcingaDB::SendAcknowledgementSet(const Checkable::Ptr& checkable, const String& author, const String& comment, AcknowledgementType type, bool persistent, double changeTime, double expiry)