]> granicus.if.org Git - icinga2/commitdiff
Merge pull request #6722 from Icinga/feature/notification-result
authorMichael Friedrich <michael.friedrich@icinga.com>
Thu, 25 Apr 2019 13:56:14 +0000 (15:56 +0200)
committerGitHub <noreply@github.com>
Thu, 25 Apr 2019 13:56:14 +0000 (15:56 +0200)
Add notification result store/sync

1  2 
doc/08-advanced-topics.md
lib/compat/compatlogger.cpp
lib/icinga/checkable.hpp

Simple merge
index fda1b2b8db4b424610f5ae7c7494673dd2fcbdb6,767dd72877670c546413c590c5820d9c63fa702c..fbbc95e6e6e99d290221122d77265b32ceb91e0b
@@@ -47,10 -47,10 +47,10 @@@ void CompatLogger::Start(bool runtimeCr
                << "'" << GetName() << "' started.";
  
        Log(LogWarning, "CompatLogger")
 -              << "The CompatLogger feature is DEPRECATED and will be removed in Icinga v2.11.";
 +              << "This feature is DEPRECATED and will be removed in future releases. Check the roadmap at https://github.com/Icinga/icinga2/milestones";
  
        Checkable::OnNewCheckResult.connect(std::bind(&CompatLogger::CheckResultHandler, this, _1, _2));
-       Checkable::OnNotificationSentToUser.connect(std::bind(&CompatLogger::NotificationSentHandler, this, _1, _2, _3, _4, _5, _6, _7, _8));
+       Checkable::OnNotificationSentToUser.connect(std::bind(&CompatLogger::NotificationSentHandler, this, _1, _2, _3, _4, _5, _6, _7, _8, _9));
        Downtime::OnDowntimeTriggered.connect(std::bind(&CompatLogger::TriggerDowntimeHandler, this, _1));
        Downtime::OnDowntimeRemoved.connect(std::bind(&CompatLogger::RemoveDowntimeHandler, this, _1));
        Checkable::OnEventCommandExecuted.connect(std::bind(&CompatLogger::EventCommandHandler, this, _1));
Simple merge