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

Merge pull request #9817 from Icinga/flexible-downtimes-disappear-too-early-9797

Browse Source 
Downtime#Start(): trigger flexible downtimes not earlier than fixed ones
This commit is contained in:
Alexander Aleksandrovič Klimov 2023-07-05 17:06:03 +02:00 committed by GitHub
commit 45d5a3f5f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/icinga/downtime.cpp
View File

@ -132,7 +132,8 @@ void Downtime::Start(bool runtimeCreated)
Log(LogNotice, "Downtime")
<< "Checkable '" << checkable->GetName() << "' already in a NOT-OK state."
<< " Triggering downtime now.";
TriggerDowntime(checkable->GetLastStateChange());
TriggerDowntime(std::fmax(std::fmax(GetStartTime(), GetEntryTime()), checkable->GetLastStateChange()));
}
if (GetFixed() && CanBeTriggered()) {