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 #7738 from Icinga/feature/icingadb-runtime-update-use-one-pub-sub-per-object-type 

IcingaDB - Runtime updates: Use one pub/sub channel per config object type
This commit is contained in:
Alexander Aleksandrovič Klimov 2020-01-07 17:13:30 +01:00 committed by GitHub
parent 387c2c8b79 275ab08303
commit 84891a6795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,7 +373,6 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
CustomVarObject::Ptr customVarObject = dynamic_pointer_cast<CustomVarObject>(object); CustomVarObject::Ptr customVarObject = dynamic_pointer_cast<CustomVarObject>(object);
auto env (GetEnvironment()); auto env (GetEnvironment());
String envId = SHA1(env); String envId = SHA1(env);
auto* configUpdates (runtimeUpdate ? &publishes["icinga:config:update"] : nullptr);
if (customVarObject) { if (customVarObject) {
auto vars(SerializeVars(customVarObject)); auto vars(SerializeVars(customVarObject));
@ -390,16 +389,16 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
allCvs.emplace_back(kv.first); allCvs.emplace_back(kv.first);
allCvs.emplace_back(JsonEncode(kv.second)); allCvs.emplace_back(JsonEncode(kv.second));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back("customvar:" + kv.first); publishes["icinga:config:update:customvar"].emplace_back(kv.first);
} }
String id = HashValue(new Array(Prepend(env, Prepend(kv.first, GetObjectIdentifiersWithoutEnv(object))))); String id = HashValue(new Array(Prepend(env, Prepend(kv.first, GetObjectIdentifiersWithoutEnv(object)))));
typeCvs.emplace_back(id); typeCvs.emplace_back(id);
typeCvs.emplace_back(JsonEncode(new Dictionary({{"object_id", objectKey}, {"environment_id", envId}, {"customvar_id", kv.first}}))); typeCvs.emplace_back(JsonEncode(new Dictionary({{"object_id", objectKey}, {"environment_id", envId}, {"customvar_id", kv.first}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":customvar:" + id); publishes["icinga:config:update:" + typeName + ":customvar"].emplace_back(id);
} }
} }
} }
@ -417,8 +416,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
actionUrls.emplace_back(HashValue(new Array({env, actionUrl}))); actionUrls.emplace_back(HashValue(new Array({env, actionUrl})));
actionUrls.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"action_url", actionUrl}}))); actionUrls.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"action_url", actionUrl}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back("action_url:" + actionUrls.at(actionUrls.size() - 2u)); publishes["icinga:config:update:action_url"].emplace_back(actionUrls.at(actionUrls.size() - 2u));
} }
} }
if (!notesUrl.IsEmpty()) { if (!notesUrl.IsEmpty()) {
@ -426,8 +425,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
notesUrls.emplace_back(HashValue(new Array({env, notesUrl}))); notesUrls.emplace_back(HashValue(new Array({env, notesUrl})));
notesUrls.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"notes_url", notesUrl}}))); notesUrls.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"notes_url", notesUrl}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back("notes_url:" + notesUrls.at(notesUrls.size() - 2u)); publishes["icinga:config:update:notes_url"].emplace_back(notesUrls.at(notesUrls.size() - 2u));
} }
} }
if (!iconImage.IsEmpty()) { if (!iconImage.IsEmpty()) {
@ -435,8 +434,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
iconImages.emplace_back(HashValue(new Array({env, iconImage}))); iconImages.emplace_back(HashValue(new Array({env, iconImage})));
iconImages.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"icon_image", iconImage}}))); iconImages.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"icon_image", iconImage}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back("icon_image:" + iconImages.at(iconImages.size() - 2u)); publishes["icinga:config:update:icon_image"].emplace_back(iconImages.at(iconImages.size() - 2u));
} }
} }
@ -469,8 +468,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
members.emplace_back(id); members.emplace_back(id);
members.emplace_back(JsonEncode(new Dictionary({{"object_id", objectKey}, {"environment_id", envId}, {"group_id", groupId}}))); members.emplace_back(JsonEncode(new Dictionary({{"object_id", objectKey}, {"environment_id", envId}, {"group_id", groupId}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":groupmember:" + id); publishes["icinga:config:update:" + typeName + ":groupmember"].emplace_back(id);
} }
groupIds->Add(groupId); groupIds->Add(groupId);
@ -499,8 +498,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
typeRanges.emplace_back(id); typeRanges.emplace_back(id);
typeRanges.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"timeperiod_id", objectKey}, {"range_key", kv.first}, {"range_value", kv.second}}))); typeRanges.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"timeperiod_id", objectKey}, {"range_key", kv.first}, {"range_value", kv.second}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":range:" + id); publishes["icinga:config:update:" + typeName + ":range"].emplace_back(id);
} }
} }
} }
@ -528,8 +527,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
includs.emplace_back(id); includs.emplace_back(id);
includs.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"timeperiod_id", objectKey}, {"include_id", includeId}}))); includs.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"timeperiod_id", objectKey}, {"include_id", includeId}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":override:include:" + id); publishes["icinga:config:update:" + typeName + ":override:include"].emplace_back(id);
} }
} }
@ -557,8 +556,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
excluds.emplace_back(id); excluds.emplace_back(id);
excluds.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"timeperiod_id", objectKey}, {"exclude_id", excludeId}}))); excluds.emplace_back(JsonEncode(new Dictionary({{"environment_id", envId}, {"timeperiod_id", objectKey}, {"exclude_id", excludeId}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":override:exclude:" + id); publishes["icinga:config:update:" + typeName + ":override:exclude"].emplace_back(id);
} }
} }
@ -580,8 +579,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
parnts.emplace_back(id); parnts.emplace_back(id);
parnts.emplace_back(JsonEncode(new Dictionary({{"zone_id", objectKey}, {"environment_id", envId}, {"parent_id", GetObjectIdentifier(parent)}}))); parnts.emplace_back(JsonEncode(new Dictionary({{"zone_id", objectKey}, {"environment_id", envId}, {"parent_id", GetObjectIdentifier(parent)}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":parent:" + id); publishes["icinga:config:update:" + typeName + ":parent"].emplace_back(id);
} }
parents->Add(GetObjectIdentifier(parent)); parents->Add(GetObjectIdentifier(parent));
@ -614,8 +613,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
members.emplace_back(id); members.emplace_back(id);
members.emplace_back(JsonEncode(new Dictionary({{"user_id", objectKey}, {"environment_id", envId}, {"group_id", groupId}}))); members.emplace_back(JsonEncode(new Dictionary({{"user_id", objectKey}, {"environment_id", envId}, {"group_id", groupId}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":groupmember:" + id); publishes["icinga:config:update:" + typeName + ":groupmember"].emplace_back(id);
} }
groupIds->Add(groupId); groupIds->Add(groupId);
@ -648,8 +647,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
usrs.emplace_back(id); usrs.emplace_back(id);
usrs.emplace_back(JsonEncode(new Dictionary({{"notification_id", objectKey}, {"environment_id", envId}, {"user_id", userId}}))); usrs.emplace_back(JsonEncode(new Dictionary({{"notification_id", objectKey}, {"environment_id", envId}, {"user_id", userId}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":user:" + id); publishes["icinga:config:update:" + typeName + ":user"].emplace_back(id);
} }
userIds->Add(userId); userIds->Add(userId);
@ -673,8 +672,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
notificationRecipients.emplace_back(id); notificationRecipients.emplace_back(id);
notificationRecipients.emplace_back(JsonEncode(new Dictionary({{"notification_id", objectKey}, {"environment_id", envId}, {"usergroup_id", usergroupId}}))); notificationRecipients.emplace_back(JsonEncode(new Dictionary({{"notification_id", objectKey}, {"environment_id", envId}, {"usergroup_id", usergroupId}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":usergroup:" + id); publishes["icinga:config:update:" + typeName + ":usergroup"].emplace_back(id);
} }
usergroupIds->Add(usergroupId); usergroupIds->Add(usergroupId);
@ -686,8 +685,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
notificationRecipients.emplace_back(id); notificationRecipients.emplace_back(id);
notificationRecipients.emplace_back(JsonEncode(new Dictionary({{"notification_id", objectKey}, {"environment_id", envId}, {"user_id", userId}}))); notificationRecipients.emplace_back(JsonEncode(new Dictionary({{"notification_id", objectKey}, {"environment_id", envId}, {"user_id", userId}})));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":recipient:" + id); publishes["icinga:config:update:" + typeName + ":recipient"].emplace_back(id);
} }
} }
@ -732,8 +731,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
typeArgs.emplace_back(id); typeArgs.emplace_back(id);
typeArgs.emplace_back(JsonEncode(values)); typeArgs.emplace_back(JsonEncode(values));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":argument:" + id); publishes["icinga:config:update:" + typeName + ":argument"].emplace_back(id);
} }
argChksms.emplace_back(id); argChksms.emplace_back(id);
@ -779,8 +778,8 @@ void IcingaDB::InsertObjectDependencies(const ConfigObject::Ptr& object, const S
typeVars.emplace_back(id); typeVars.emplace_back(id);
typeVars.emplace_back(JsonEncode(values)); typeVars.emplace_back(JsonEncode(values));
if (configUpdates) { if (runtimeUpdate) {
configUpdates->emplace_back(typeName + ":envvar:" + id); publishes["icinga:config:update:" + typeName + ":envvar"].emplace_back(id);
} }
varChksms.emplace_back(id); varChksms.emplace_back(id);
@ -815,7 +814,7 @@ void IcingaDB::SendConfigUpdate(const ConfigObject::Ptr& object, bool runtimeUpd
if (checkable) { if (checkable) {
String objectKey = GetObjectIdentifier(object); String objectKey = GetObjectIdentifier(object);
m_Rcon->FireAndForgetQuery({"HSET", m_PrefixStateObject + typeName, objectKey, JsonEncode(SerializeState(checkable))}, Prio::State); m_Rcon->FireAndForgetQuery({"HSET", m_PrefixStateObject + typeName, objectKey, JsonEncode(SerializeState(checkable))}, Prio::State);
publishes["icinga:config:update"].emplace_back("state:" + typeName + ":" + objectKey); publishes["icinga:config:update:state:" + typeName].emplace_back(objectKey);
} }
std::vector<std::vector<String> > transaction = {{"MULTI"}}; std::vector<std::vector<String> > transaction = {{"MULTI"}};
@ -1150,7 +1149,7 @@ IcingaDB::CreateConfigUpdate(const ConfigObject::Ptr& object, const String typeN
/* Send an update event to subscribers. */ /* Send an update event to subscribers. */
if (runtimeUpdate) { if (runtimeUpdate) {
publishes["icinga:config:update"].emplace_back(typeName + ":" + objectKey); publishes["icinga:config:update:" + typeName].emplace_back(objectKey);
} }
} }
@ -1162,7 +1161,7 @@ void IcingaDB::SendConfigDelete(const ConfigObject::Ptr& object)
m_Rcon->FireAndForgetQueries({ m_Rcon->FireAndForgetQueries({
{"HDEL", m_PrefixConfigObject + typeName, objectKey}, {"HDEL", m_PrefixConfigObject + typeName, objectKey},
{"DEL", m_PrefixStateObject + typeName + ":" + objectKey}, {"DEL", m_PrefixStateObject + typeName + ":" + objectKey},
{"PUBLISH", "icinga:config:delete", typeName + ":" + objectKey} {"PUBLISH", "icinga:config:delete:" + typeName, objectKey}
}, Prio::Config); }, Prio::Config);
auto checkable (dynamic_pointer_cast<Checkable>(object)); auto checkable (dynamic_pointer_cast<Checkable>(object));