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

RedisWriter: dump monitored objects' groups' identifiers (group_checksums)

This commit is contained in:
Alexander A. Klimov 2018-06-22 17:19:25 +02:00 committed by Michael Friedrich
parent 724ce1f172
commit c92827fa5e
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,12 +21,15 @@
#include "icinga/customvarobject.hpp" #include "icinga/customvarobject.hpp"
#include "icinga/host.hpp" #include "icinga/host.hpp"
#include "icinga/service.hpp" #include "icinga/service.hpp"
#include "icinga/hostgroup.hpp"
#include "icinga/servicegroup.hpp"
#include "base/json.hpp" #include "base/json.hpp"
#include "base/logger.hpp" #include "base/logger.hpp"
#include "base/serializer.hpp" #include "base/serializer.hpp"
#include "base/tlsutility.hpp" #include "base/tlsutility.hpp"
#include "base/initialize.hpp" #include "base/initialize.hpp"
#include "base/convert.hpp" #include "base/convert.hpp"
#include "base/array.hpp"
#include <set> #include <set>
using namespace icinga; using namespace icinga;
@ -126,6 +129,16 @@ void RedisWriter::UpdateAllConfigObjects(void)
<< "Initial config/status dump finished in " << Utility::GetTime() - startTime << " seconds."; << "Initial config/status dump finished in " << Utility::GetTime() - startTime << " seconds.";
} }
static ConfigObject::Ptr GetHostGroup(const String& name)
{
return ConfigObject::GetObject<HostGroup>(name);
}
static ConfigObject::Ptr GetServiceGroup(const String& name)
{
return ConfigObject::GetObject<ServiceGroup>(name);
}
void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, bool useTransaction, bool runtimeUpdate) void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, bool useTransaction, bool runtimeUpdate)
{ {
AssertOnWorkQueue(); AssertOnWorkQueue();
@ -168,10 +181,29 @@ void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, bool useTran
tie(host, service) = GetHostService(checkable); tie(host, service) = GetHostService(checkable);
if (service) Array::Ptr groups;
checkSums->Set("groups_checksum", CalculateCheckSumGroups(service->GetGroups())); ConfigObject::Ptr (*getGroup)(const String& name);
else
checkSums->Set("groups_checksum", CalculateCheckSumGroups(host->GetGroups())); if (service) {
groups = service->GetGroups();
getGroup = &::GetServiceGroup;
} else {
groups = host->GetGroups();
getGroup = &::GetHostGroup;
}
checkSums->Set("groups_checksum", CalculateCheckSumGroups(groups));
Array::Ptr groupChecksums = new Array();
ObjectLock groupsLock (groups);
ObjectLock groupChecksumsLock (groupChecksums);
for (auto group : groups) {
groupChecksums->Add(GetIdentifier((*getGroup)(group.Get<String>())));
}
checkSums->Set("group_checksums", groupChecksums);
} else { } else {
Zone::Ptr zone = dynamic_pointer_cast<Zone>(object); Zone::Ptr zone = dynamic_pointer_cast<Zone>(object);