tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

On ScheduledDowntime change: ignore downtimes created before change

Browse Source 
... while creating new downtimes.

refs #8309
This commit is contained in:
Alexander A. Klimov 2021-05-19 12:51:31 +02:00
parent a262d18921
commit ffa3872b28
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/icinga/scheduleddowntime.cpp
View File

@ -240,11 +240,16 @@ void ScheduledDowntime::CreateNextDowntime()
} }
double minEnd = 0; double minEnd = 0;
auto downtimeOptionsHash (HashDowntimeOptions());
for (const Downtime::Ptr& downtime : GetCheckable()->GetDowntimes()) { for (const Downtime::Ptr& downtime : GetCheckable()->GetDowntimes()) {
if (downtime->GetScheduledBy() != GetName()) if (downtime->GetScheduledBy() != GetName())
continue; continue;
auto configOwnerHash (downtime->GetConfigOwnerHash());
if (!configOwnerHash.IsEmpty() && configOwnerHash != downtimeOptionsHash)
continue;
double end = downtime->GetEndTime(); double end = downtime->GetEndTime();
if (end > minEnd) if (end > minEnd)
minEnd = end; minEnd = end;