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

Merge pull request #9011 from Icinga/bugfix/icingadb-remove-zone-parent-key 

Icinga DB: Remove unused Redis key 'icinga:zone:parent'
This commit is contained in:
Alexander Aleksandrovič Klimov 2021-10-08 17:19:51 +02:00 committed by GitHub
parent ff60c1af37 750e64b974
commit 4190d58668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -538,8 +538,6 @@ std::vector<String> IcingaDB::GetTypeOverwriteKeys(const String& type)
keys.emplace_back(m_PrefixConfigObject + type + ":override:include"); keys.emplace_back(m_PrefixConfigObject + type + ":override:include");
keys.emplace_back(m_PrefixConfigObject + type + ":override:exclude"); keys.emplace_back(m_PrefixConfigObject + type + ":override:exclude");
keys.emplace_back(m_PrefixConfigObject + type + ":range"); keys.emplace_back(m_PrefixConfigObject + type + ":range");
} else if (type == "zone") {
keys.emplace_back(m_PrefixConfigObject + type + ":parent");
} else if (type == "notification") { } else if (type == "notification") {
keys.emplace_back(m_PrefixConfigObject + type + ":user"); keys.emplace_back(m_PrefixConfigObject + type + ":user");
keys.emplace_back(m_PrefixConfigObject + type + ":usergroup"); keys.emplace_back(m_PrefixConfigObject + type + ":usergroup");
@ -572,8 +570,6 @@ std::vector<String> IcingaDB::GetTypeDumpSignalKeys(const Type::Ptr& type)
keys.emplace_back(m_PrefixConfigObject + lcType + ":override:include"); keys.emplace_back(m_PrefixConfigObject + lcType + ":override:include");
keys.emplace_back(m_PrefixConfigObject + lcType + ":override:exclude"); keys.emplace_back(m_PrefixConfigObject + lcType + ":override:exclude");
keys.emplace_back(m_PrefixConfigObject + lcType + ":range"); keys.emplace_back(m_PrefixConfigObject + lcType + ":range");
} else if (type == Zone::TypeInstance) {
keys.emplace_back(m_PrefixConfigObject + lcType + ":parent");
} else if (type == Notification::TypeInstance) { } else if (type == Notification::TypeInstance) {
keys.emplace_back(m_PrefixConfigObject + lcType + ":user"); keys.emplace_back(m_PrefixConfigObject + lcType + ":user");
keys.emplace_back(m_PrefixConfigObject + lcType + ":usergroup"); keys.emplace_back(m_PrefixConfigObject + lcType + ":usergroup");
@ -823,32 +819,6 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
return; return;
} }
if (type == Zone::TypeInstance) {
Zone::Ptr zone = static_pointer_cast<Zone>(object);
Array::Ptr parents(new Array);
auto parentsRaw (zone->GetAllParentsRaw());
parents->Reserve(parentsRaw.size());
auto& parnts (hMSets[m_PrefixConfigObject + typeName + ":parent"]);
for (auto& parent : parentsRaw) {
String id = HashValue(new Array(Prepend(env, Prepend(GetObjectIdentifiersWithoutEnv(parent), GetObjectIdentifiersWithoutEnv(object)))));
parnts.emplace_back(id);
Dictionary::Ptr data = new Dictionary({{"zone_id", objectKey}, {"environment_id", m_EnvironmentId}, {"parent_id", GetObjectIdentifier(parent)}});
parnts.emplace_back(JsonEncode(data));
if (runtimeUpdate) {
AddObjectDataToRuntimeUpdates(runtimeUpdates, id, m_PrefixConfigObject + typeName + ":parent", data);
}
parents->Add(GetObjectIdentifier(parent));
}
return;
}
if (type == User::TypeInstance) { if (type == User::TypeInstance) {
User::Ptr user = static_pointer_cast<User>(object); User::Ptr user = static_pointer_cast<User>(object);