Implement one-time notification for escalation contacts.

Fixes #5011

diff --git a/components/notification/notificationcomponent.cpp b/components/notification/notificationcomponent.cpp
index 9d712f34a7e902b1451368417a2b3f348bf6f7c4..f92d690f57c857d109ed8acdc60452c688607829 100644 (file)
--- a/components/notification/notificationcomponent.cpp
+++ b/components/notification/notificationcomponent.cpp
@@ -56,15 +56,12 @@ void NotificationComponent::NotificationTimerHandler(void)
        double now = Utility::GetTime();
 
        BOOST_FOREACH(const Notification::Ptr& notification, DynamicType::GetObjects<Notification>()) {
-               if (notification->GetNotificationInterval() <= 0)
-                       continue;
+               Service::Ptr service = notification->GetService();
 
-               if (notification->GetNextNotification() > now)
+               if (notification->GetNotificationInterval() <= 0 && notification->GetLastProblemNotification() < service->GetLastHardStateChange())
                        continue;
 
-               Service::Ptr service = notification->GetService();
-
-               if (!service)
+               if (notification->GetNextNotification() > now)
                        continue;
 
                bool reachable = service->IsReachable();
@@ -107,5 +104,5 @@ void NotificationComponent::NotificationTimerHandler(void)
 void NotificationComponent::SendNotificationsHandler(const Service::Ptr& service, NotificationType type,
     const CheckResult::Ptr& cr, const String& author, const String& text)
 {
-       service->SendNotifications(static_cast<NotificationType>(type), cr, author, text);
+       service->SendNotifications(type, cr, author, text);
 }

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index f6204ca188d1920f6ac81976a14cf4c533ac55e9..f22efb822d7b71cb3c8b8772f004d9fa2d8cd95a 100644 (file)
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -217,7 +217,11 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
        {
                ObjectLock olock(this);
 
-               SetLastNotification(Utility::GetTime());
+               double now = Utility::GetTime();
+               SetLastNotification(now);
+
+               if (type == NotificationProblem)
+                       SetLastProblemNotification(now);
        }
 
        std::set<User::Ptr> allUsers;

diff --git a/lib/icinga/notification.ti b/lib/icinga/notification.ti
index d7cf424e9e3b60445cb00a48fec0dbf1e0088bbc..e6b299b4de9b3ecc9419f2d8b22884345f1dfd33 100644 (file)
--- a/lib/icinga/notification.ti
+++ b/lib/icinga/notification.ti
@@ -26,6 +26,7 @@ class Notification : DynamicObject
        [state] double last_notification;
        [state, set_protected] double next_notification (NextNotificationRaw);
        [state, set_protected] Value notification_number;
+       [state] double last_problem_notification;
 };
 
-}
\ No newline at end of file
+}