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 #6920 from Icinga/bugfix/scheduleddowntime-zone 

Downtime::AddDowntime(): place Downtimes in the same zone as the origin ScheduledDowntimes
This commit is contained in:
Michael Friedrich 2019-01-29 13:35:32 +01:00 committed by GitHub
parent 12ddaa792e ce847324bc
commit feea76a80d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/icinga/downtime.cpp
View File

@ -267,7 +267,23 @@ String Downtime::AddDowntime(const Checkable::Ptr& checkable, const String& auth
if (service) if (service)
attrs->Set("service_name", service->GetShortName()); attrs->Set("service_name", service->GetShortName());
String zone = checkable->GetZoneName(); String zone;
if (!scheduledDowntime.IsEmpty()) {
auto sdt (ScheduledDowntime::GetByName(scheduledDowntime));
if (sdt) {
auto sdtZone (sdt->GetZone());
if (sdtZone) {
zone = sdtZone->GetName();
}
}
}
if (zone.IsEmpty()) {
zone = checkable->GetZoneName();
}
if (!zone.IsEmpty()) if (!zone.IsEmpty())
attrs->Set("zone", zone); attrs->Set("zone", zone);