Merge pull request #7050 from Icinga/feature/previous-state-change

[icinga2] / lib / notification / notificationcomponent.cpp

diff --git a/lib/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp
index 5ad1a43eacc979a5737d37fbcf808a7b4e52841b..36fe8ecaa68996c2d0f469698cdc12f6a08a605c 100644 (file)
--- a/lib/notification/notificationcomponent.cpp
+++ b/lib/notification/notificationcomponent.cpp
@@ -1,24 +1,7 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)  *
- *                                                                            *
- * This program is free software; you can redistribute it and/or              *
- * modify it under the terms of the GNU General Public License                *
- * as published by the Free Software Foundation; either version 2             *
- * of the License, or (at your option) any later version.                     *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software Foundation     *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #include "notification/notificationcomponent.hpp"
-#include "notification/notificationcomponent.tcpp"
+#include "notification/notificationcomponent-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "base/configtype.hpp"
@@ -36,13 +19,13 @@ REGISTER_STATSFUNCTION(NotificationComponent, &NotificationComponent::StatsFunc)
 
 void NotificationComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
 {
-       Dictionary::Ptr nodes = new Dictionary();
+       DictionaryData nodes;
 
        for (const NotificationComponent::Ptr& notification_component : ConfigType::GetObjectsByType<NotificationComponent>()) {
-               nodes->Set(notification_component->GetName(), 1); //add more stats
+               nodes.emplace_back(notification_component->GetName(), 1); //add more stats
        }
 
-       status->Set("notificationcomponent", nodes);
+       status->Set("notificationcomponent", new Dictionary(std::move(nodes)));
 }
 
 /**
@@ -53,10 +36,10 @@ void NotificationComponent::Start(bool runtimeCreated)
        ObjectImpl<NotificationComponent>::Start(runtimeCreated);
 
        Log(LogInformation, "NotificationComponent")
-           << "'" << GetName() << "' started.";
+               << "'" << GetName() << "' started.";
 
        Checkable::OnNotificationsRequested.connect(std::bind(&NotificationComponent::SendNotificationsHandler, this, _1,
-           _2, _3, _4, _5));
+               _2, _3, _4, _5));
 
        m_NotificationTimer = new Timer();
        m_NotificationTimer->SetInterval(5);
@@ -67,7 +50,7 @@ void NotificationComponent::Start(bool runtimeCreated)
 void NotificationComponent::Stop(bool runtimeRemoved)
 {
        Log(LogInformation, "NotificationComponent")
-           << "'" << GetName() << "' stopped.";
+               << "'" << GetName() << "' stopped.";
 
        ObjectImpl<NotificationComponent>::Stop(runtimeRemoved);
 }
@@ -77,24 +60,36 @@ void NotificationComponent::Stop(bool runtimeRemoved)
  *
  * @param - Event arguments for the timer.
  */
-void NotificationComponent::NotificationTimerHandler(void)
+void NotificationComponent::NotificationTimerHandler()
 {
        double now = Utility::GetTime();
 
+       /* Function already checks whether 'api' feature is enabled. */
+       Endpoint::Ptr myEndpoint = Endpoint::GetLocalEndpoint();
+
        for (const Notification::Ptr& notification : ConfigType::GetObjectsByType<Notification>()) {
                if (!notification->IsActive())
                        continue;
 
-               if (notification->IsPaused() && GetEnableHA())
+               String notificationName = notification->GetName();
+
+               /* Skip notification if paused, in a cluster setup & HA feature is enabled. */
+               if (notification->IsPaused() && myEndpoint && GetEnableHA()) {
+                       Log(LogNotice, "NotificationComponent")
+                               << "Reminder notification '" << notificationName << "': HA cluster active, this endpoint does not have the authority (paused=true). Skipping.";
                        continue;
+               }
 
                Checkable::Ptr checkable = notification->GetCheckable();
 
                if (!IcingaApplication::GetInstance()->GetEnableNotifications() || !checkable->GetEnableNotifications())
                        continue;
 
-               if (notification->GetInterval() <= 0 && notification->GetNoMoreNotifications())
+               if (notification->GetInterval() <= 0 && notification->GetNoMoreNotifications()) {
+                       Log(LogNotice, "NotificationComponent")
+                               << "Reminder notification '" << notificationName << "': Notification was sent out once and interval=0 disables reminder notifications.";
                        continue;
+               }
 
                if (notification->GetNextNotification() > now)
                        continue;
@@ -116,21 +111,24 @@ void NotificationComponent::NotificationTimerHandler(void)
                        if (checkable->GetStateType() == StateTypeSoft)
                                continue;
 
+                       /* Don't send reminder notifications for OK/Up states. */
                        if ((service && service->GetState() == ServiceOK) || (!service && host->GetState() == HostUp))
                                continue;
 
-                       if (!reachable || checkable->IsInDowntime() || checkable->IsAcknowledged())
+                       /* Skip in runtime filters. */
+                       if (!reachable || checkable->IsInDowntime() || checkable->IsAcknowledged() || checkable->IsFlapping())
                                continue;
                }
 
                try {
                        Log(LogNotice, "NotificationComponent")
-                           << "Attempting to send reminder notification '" << notification->GetName() << "'";
+                               << "Attempting to send reminder notification '" << notificationName << "'.";
+
                        notification->BeginExecuteNotification(NotificationProblem, checkable->GetLastCheckResult(), false, true);
                } catch (const std::exception& ex) {
                        Log(LogWarning, "NotificationComponent")
-                           << "Exception occured during notification for object '"
-                           << GetName() << "': " << DiagnosticInformation(ex);
+                               << "Exception occurred during notification for object '"
+                               << notificationName << "': " << DiagnosticInformation(ex, false);
                }
        }
 }
@@ -139,7 +137,7 @@ void NotificationComponent::NotificationTimerHandler(void)
  * Processes icinga::SendNotifications messages.
  */
 void NotificationComponent::SendNotificationsHandler(const Checkable::Ptr& checkable, NotificationType type,
-    const CheckResult::Ptr& cr, const String& author, const String& text)
+       const CheckResult::Ptr& cr, const String& author, const String& text)
 {
        checkable->SendNotifications(type, cr, author, text);
 }