Implement load balancing for notifications

fixes #6203

diff --git a/components/notification/notification-type.conf b/components/notification/notification-type.conf
index bcb3f676b6a17bbf315e64bba4b4c2d8101c8ca4..54bf6d5d656277da6acbcf7ed70339a6f33de629 100644 (file)
--- a/components/notification/notification-type.conf
+++ b/components/notification/notification-type.conf
@@ -18,4 +18,5 @@
  ******************************************************************************/
 
 %type NotificationComponent {
+       %attribute %number "enable_ha"
 }

diff --git a/components/notification/notificationcomponent.cpp b/components/notification/notificationcomponent.cpp
index faf2a7092ad6f20d4fb88aae44c273f4afa1575d..efe0b66ea41f9ec81f7f1e5f8f4928f784c626f2 100644 (file)
--- a/components/notification/notificationcomponent.cpp
+++ b/components/notification/notificationcomponent.cpp
@@ -75,6 +75,9 @@ void NotificationComponent::NotificationTimerHandler(void)
        BOOST_FOREACH(const Notification::Ptr& notification, DynamicType::GetObjects<Notification>()) {
                Checkable::Ptr checkable = notification->GetCheckable();
 
+               if (checkable->IsPaused() && GetEnableHA())
+                       continue;
+
                if (!IcingaApplication::GetInstance()->GetEnableNotifications() || !checkable->GetEnableNotifications())
                        continue;
 
@@ -128,5 +131,8 @@ void NotificationComponent::NotificationTimerHandler(void)
 void NotificationComponent::SendNotificationsHandler(const Checkable::Ptr& checkable, NotificationType type,
     const CheckResult::Ptr& cr, const String& author, const String& text)
 {
+       if (checkable->IsPaused() && GetEnableHA())
+               return;
+
        checkable->SendNotifications(type, cr, author, text);
 }

diff --git a/components/notification/notificationcomponent.ti b/components/notification/notificationcomponent.ti
index 1758f9537cec2104a6a8da8f22fd484c763f286c..53a28d7b3c6908d8f47199882ea544c6840580ca 100644 (file)
--- a/components/notification/notificationcomponent.ti
+++ b/components/notification/notificationcomponent.ti
@@ -5,6 +5,9 @@ namespace icinga
 
 class NotificationComponent : DynamicObject
 {
+       [config] bool enable_ha (EnableHA) {
+               default {{{ return true; }}}
+       };
 };
 
 }