tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9399 from Icinga/feature/add-name-suffix-to-columns-referring-to-name-2.13

Browse Source 
IcingaDB: Add `_name` suffix to columns referring to name
This commit is contained in:
Alexander Aleksandrovič Klimov 2022-06-23 11:30:28 +02:00 committed by GitHub
commit c5d66b5150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,7 @@ void IcingaDB::ConfigStaticInitialize()
void IcingaDB::UpdateAllConfigObjects() void IcingaDB::UpdateAllConfigObjects()
{ {
m_Rcon->Sync(); m_Rcon->Sync();
m_Rcon->FireAndForgetQuery({"XADD", "icinga:schema", "MAXLEN", "1", "*", "version", "4"}, Prio::Heartbeat); m_Rcon->FireAndForgetQuery({"XADD", "icinga:schema", "MAXLEN", "1", "*", "version", "5"}, Prio::Heartbeat);
Log(LogInformation, "IcingaDB") << "Starting initial config/status dump"; Log(LogInformation, "IcingaDB") << "Starting initial config/status dump";
double startTime = Utility::GetTime(); double startTime = Utility::GetTime();
@ -1225,7 +1225,7 @@ bool IcingaDB::PrepareObject(const ConfigObject::Ptr& object, Dictionary::Ptr& a
if (ObjectsZone) { if (ObjectsZone) {
attributes->Set("zone_id", GetObjectIdentifier(ObjectsZone)); attributes->Set("zone_id", GetObjectIdentifier(ObjectsZone));
attributes->Set("zone", ObjectsZone->GetName()); attributes->Set("zone_name", ObjectsZone->GetName());
} }
if (type == Endpoint::TypeInstance) { if (type == Endpoint::TypeInstance) {
@ -1251,7 +1251,7 @@ bool IcingaDB::PrepareObject(const ConfigObject::Ptr& object, Dictionary::Ptr& a
if (type == Host::TypeInstance || type == Service::TypeInstance) { if (type == Host::TypeInstance || type == Service::TypeInstance) {
Checkable::Ptr checkable = static_pointer_cast<Checkable>(object); Checkable::Ptr checkable = static_pointer_cast<Checkable>(object);
attributes->Set("checkcommand", checkable->GetCheckCommand()->GetName()); attributes->Set("checkcommand_name", checkable->GetCheckCommand()->GetName());
attributes->Set("max_check_attempts", checkable->GetMaxCheckAttempts()); attributes->Set("max_check_attempts", checkable->GetMaxCheckAttempts());
attributes->Set("check_timeout", checkable->GetCheckTimeout()); attributes->Set("check_timeout", checkable->GetCheckTimeout());
attributes->Set("check_interval", checkable->GetCheckInterval()); attributes->Set("check_interval", checkable->GetCheckInterval());
@ -1273,19 +1273,19 @@ bool IcingaDB::PrepareObject(const ConfigObject::Ptr& object, Dictionary::Ptr& a
Endpoint::Ptr commandEndpoint = checkable->GetCommandEndpoint(); Endpoint::Ptr commandEndpoint = checkable->GetCommandEndpoint();
if (commandEndpoint) { if (commandEndpoint) {
attributes->Set("command_endpoint_id", GetObjectIdentifier(commandEndpoint)); attributes->Set("command_endpoint_id", GetObjectIdentifier(commandEndpoint));
attributes->Set("command_endpoint", commandEndpoint->GetName()); attributes->Set("command_endpoint_name", commandEndpoint->GetName());
} }
TimePeriod::Ptr timePeriod = checkable->GetCheckPeriod(); TimePeriod::Ptr timePeriod = checkable->GetCheckPeriod();
if (timePeriod) { if (timePeriod) {
attributes->Set("check_timeperiod_id", GetObjectIdentifier(timePeriod)); attributes->Set("check_timeperiod_id", GetObjectIdentifier(timePeriod));
attributes->Set("check_timeperiod", timePeriod->GetName()); attributes->Set("check_timeperiod_name", timePeriod->GetName());
} }
EventCommand::Ptr eventCommand = checkable->GetEventCommand(); EventCommand::Ptr eventCommand = checkable->GetEventCommand();
if (eventCommand) { if (eventCommand) {
attributes->Set("eventcommand_id", GetObjectIdentifier(eventCommand)); attributes->Set("eventcommand_id", GetObjectIdentifier(eventCommand));
attributes->Set("eventcommand", eventCommand->GetName()); attributes->Set("eventcommand_name", eventCommand->GetName());
} }
String actionUrl = checkable->GetActionUrl(); String actionUrl = checkable->GetActionUrl();