tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only check escalations for problem notifications.

This commit is contained in:
Gunnar Beutner 2013-07-19 11:02:43 +02:00
parent dfda90f744
commit 511b052105
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/notification.cpp
View File

@ -271,6 +271,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const Diction
Dictionary::Ptr times = GetTimes(); Dictionary::Ptr times = GetTimes();
Service::Ptr service = GetService(); Service::Ptr service = GetService();
if (type == NotificationProblem) {
if (times && times->Contains("begin") && now < service->GetLastHardStateChange() + times->Get("begin")) { if (times && times->Contains("begin") && now < service->GetLastHardStateChange() + times->Get("begin")) {
Log(LogInformation, "icinga", "Not sending notifications for notification object '" + GetName() + "': before escalation range"); Log(LogInformation, "icinga", "Not sending notifications for notification object '" + GetName() + "': before escalation range");
return; return;
@ -280,6 +281,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const Diction
Log(LogInformation, "icinga", "Not sending notifications for notification object '" + GetName() + "': after escalation range"); Log(LogInformation, "icinga", "Not sending notifications for notification object '" + GetName() + "': after escalation range");
return; return;
} }
}
unsigned long ftype = 1 << type; unsigned long ftype = 1 << type;