Merge pull request #6727 from Icinga/feature/cluster-config-sync-stage

[icinga2] / lib / icinga / notification.hpp

diff --git a/lib/icinga/notification.hpp b/lib/icinga/notification.hpp
index b87bb702ce0e319f11ed0fb5f491c83b9454cfc3..c483eaf9178fa209d19b9bf50132a1381e36d150 100644 (file)
--- a/lib/icinga/notification.hpp
+++ b/lib/icinga/notification.hpp
@@ -1,32 +1,16 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2018 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+ */
 
 #ifndef NOTIFICATION_H
 #define NOTIFICATION_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/notification.thpp"
-#include "icinga/checkable.thpp"
+#include "icinga/notification-ti.hpp"
+#include "icinga/checkable-ti.hpp"
 #include "icinga/user.hpp"
 #include "icinga/usergroup.hpp"
 #include "icinga/timeperiod.hpp"
 #include "icinga/checkresult.hpp"
+#include "icinga/notificationresult.hpp"
 #include "remote/endpoint.hpp"
 #include "remote/messageorigin.hpp"
 #include "base/array.hpp"
@@ -99,15 +83,19 @@ public:
 
        Endpoint::Ptr GetCommandEndpoint() const;
 
+       void ProcessNotificationResult(const NotificationResult::Ptr& nr, const MessageOrigin::Ptr& origin = nullptr);
+
        static String NotificationTypeToString(NotificationType type);
        static String NotificationFilterToString(int filter, const std::map<String, int>& filterMap);
 
        static boost::signals2::signal<void (const Notification::Ptr&, const MessageOrigin::Ptr&)> OnNextNotificationChanged;
+       static boost::signals2::signal<void (const Notification::Ptr&, const NotificationResult::Ptr&, const MessageOrigin::Ptr&)> OnNewNotificationResult;
 
        void Validate(int types, const ValidationUtils& utils) override;
 
-       void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override;
-       void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override;
+       void ValidateStates(const Lazy<Array::Ptr>& lvalue, const ValidationUtils& utils) override;
+       void ValidateTypes(const Lazy<Array::Ptr>& lvalue, const ValidationUtils& utils) override;
+       void ValidateTimes(const Lazy<Dictionary::Ptr>& lvalue, const ValidationUtils& utils) override;
 
        static void EvaluateApplyRules(const intrusive_ptr<Host>& host);
        static void EvaluateApplyRules(const intrusive_ptr<Service>& service);