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 #6292 from Icinga/fix/flapping-reminder-notification 

Fix problem with reminder notifications if the checkable is flapping
This commit is contained in:
Noah Hilverling 2018-05-17 13:52:29 +02:00 committed by GitHub
parent 120eb070d2 16e8e3cf4b
commit a5a2194fa2
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/notification/notificationcomponent.cpp
View File

@ -119,13 +119,14 @@ void NotificationComponent::NotificationTimerHandler()
if ((service && service->GetState() == ServiceOK) || (!service && host->GetState() == HostUp)) if ((service && service->GetState() == ServiceOK) || (!service && host->GetState() == HostUp))
continue; continue;
if (!reachable || checkable->IsInDowntime() || checkable->IsAcknowledged()) if (!reachable || checkable->IsInDowntime() || checkable->IsAcknowledged() || checkable->IsFlapping())
continue; continue;
} }
try { try {
Log(LogNotice, "NotificationComponent") Log(LogNotice, "NotificationComponent")
<< "Attempting to send reminder notification '" << notification->GetName() << "'"; << "Attempting to send reminder notification '" << notification->GetName() << "'";
notification->BeginExecuteNotification(NotificationProblem, checkable->GetLastCheckResult(), false, true); notification->BeginExecuteNotification(NotificationProblem, checkable->GetLastCheckResult(), false, true);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
Log(LogWarning, "NotificationComponent") Log(LogWarning, "NotificationComponent")