Remove bottom-up cluster messages

refs #4799

diff --git a/lib/icinga/clusterevents.cpp b/lib/icinga/clusterevents.cpp
index 506971e6a7f1af881e985e7a3f3f5705fce56886..57b4691e1913090964cf9cc3c48fc35b6086d2c8 100644 (file)
--- a/lib/icinga/clusterevents.cpp
+++ b/lib/icinga/clusterevents.cpp
@@ -46,14 +46,11 @@ REGISTER_APIFUNCTION(SetForceNextCheck, event, &ClusterEvents::ForceNextCheckCha
 REGISTER_APIFUNCTION(SetForceNextNotification, event, &ClusterEvents::ForceNextNotificationChangedAPIHandler);
 REGISTER_APIFUNCTION(SetAcknowledgement, event, &ClusterEvents::AcknowledgementSetAPIHandler);
 REGISTER_APIFUNCTION(ClearAcknowledgement, event, &ClusterEvents::AcknowledgementClearedAPIHandler);
-REGISTER_APIFUNCTION(UpdateRepository, event, &ClusterEvents::UpdateRepositoryAPIHandler);
 REGISTER_APIFUNCTION(ExecuteCommand, event, &ClusterEvents::ExecuteCommandAPIHandler);
 REGISTER_APIFUNCTION(SendNotifications, event, &ClusterEvents::SendNotificationsAPIHandler);
 REGISTER_APIFUNCTION(NotificationSentUser, event, &ClusterEvents::NotificationSentUserAPIHandler);
 REGISTER_APIFUNCTION(NotificationSentToAllUsers, event, &ClusterEvents::NotificationSentToAllUsersAPIHandler);
 
-static Timer::Ptr l_RepositoryTimer;
-
 void ClusterEvents::StaticInitialize(void)
 {
        Checkable::OnNewCheckResult.connect(&ClusterEvents::CheckResultHandler);
@@ -67,12 +64,6 @@ void ClusterEvents::StaticInitialize(void)
 
        Checkable::OnAcknowledgementSet.connect(&ClusterEvents::AcknowledgementSetHandler);
        Checkable::OnAcknowledgementCleared.connect(&ClusterEvents::AcknowledgementClearedHandler);
-
-       l_RepositoryTimer = new Timer();
-       l_RepositoryTimer->SetInterval(30);
-       l_RepositoryTimer->OnTimerExpired.connect(boost::bind(&ClusterEvents::RepositoryTimerHandler));
-       l_RepositoryTimer->Start();
-       l_RepositoryTimer->Reschedule(0);
 }
 
 Dictionary::Ptr ClusterEvents::MakeCheckResultMessage(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr)
@@ -697,101 +688,6 @@ Value ClusterEvents::ExecuteCommandAPIHandler(const MessageOrigin::Ptr& origin,
        return Empty;
 }
 
-void ClusterEvents::RepositoryTimerHandler(void)
-{
-       ApiListener::Ptr listener = ApiListener::GetInstance();
-
-       if (!listener)
-               return;
-
-       Dictionary::Ptr repository = new Dictionary();
-
-       for (const Host::Ptr& host : ConfigType::GetObjectsByType<Host>()) {
-               Array::Ptr services = new Array();
-
-               for (const Service::Ptr& service : host->GetServices()) {
-                       services->Add(service->GetShortName());
-               }
-
-               repository->Set(host->GetName(), services);
-       }
-
-       Endpoint::Ptr my_endpoint = Endpoint::GetLocalEndpoint();
-
-       if (!my_endpoint) {
-               Log(LogWarning, "ClusterEvents", "No local endpoint defined. Bailing out.");
-               return;
-       }
-
-       Zone::Ptr my_zone = my_endpoint->GetZone();
-
-       if (!my_zone)
-               return;
-
-       Dictionary::Ptr params = new Dictionary();
-       params->Set("seen", Utility::GetTime());
-       params->Set("endpoint", my_endpoint->GetName());
-       params->Set("zone", my_zone->GetName());
-       params->Set("repository", repository);
-
-       Dictionary::Ptr message = new Dictionary();
-       message->Set("jsonrpc", "2.0");
-       message->Set("method", "event::UpdateRepository");
-       message->Set("params", params);
-
-       listener->RelayMessage(MessageOrigin::Ptr(), my_zone, message, false);
-}
-
-String ClusterEvents::GetRepositoryDir(void)
-{
-       return Application::GetLocalStateDir() + "/lib/icinga2/api/repository/";
-}
-
-Value ClusterEvents::UpdateRepositoryAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
-{
-       if (!params)
-               return Empty;
-
-       Value vrepository = params->Get("repository");
-       if (vrepository.IsEmpty() || !vrepository.IsObjectType<Dictionary>())
-               return Empty;
-
-       Utility::MkDirP(GetRepositoryDir(), 0755);
-
-       String repositoryFile = GetRepositoryDir() + SHA256(params->Get("endpoint")) + ".repo";
-
-       std::fstream fp;
-       String tempRepositoryFile = Utility::CreateTempFile(repositoryFile + ".XXXXXX", 0644, fp);
-
-       fp << JsonEncode(params);
-       fp.close();
-
-#ifdef _WIN32
-       _unlink(repositoryFile.CStr());
-#endif /* _WIN32 */
-
-       if (rename(tempRepositoryFile.CStr(), repositoryFile.CStr()) < 0) {
-               BOOST_THROW_EXCEPTION(posix_error()
-                   << boost::errinfo_api_function("rename")
-                   << boost::errinfo_errno(errno)
-                   << boost::errinfo_file_name(tempRepositoryFile));
-       }
-
-       ApiListener::Ptr listener = ApiListener::GetInstance();
-
-       if (!listener)
-               return Empty;
-
-       Dictionary::Ptr message = new Dictionary();
-       message->Set("jsonrpc", "2.0");
-       message->Set("method", "event::UpdateRepository");
-       message->Set("params", params);
-
-       listener->RelayMessage(origin, Zone::GetLocalZone(), message, true);
-
-       return Empty;
-}
-
 void ClusterEvents::SendNotificationsHandler(const Checkable::Ptr& checkable, NotificationType type,
     const CheckResult::Ptr& cr, const String& author, const String& text, const MessageOrigin::Ptr& origin)
 {

diff --git a/lib/icinga/clusterevents.hpp b/lib/icinga/clusterevents.hpp
index 702f145ef662010eb6db7480d9be771f11367de0..ca7732aee2255cafbc3c666a14ea3baf0c427767 100644 (file)
--- a/lib/icinga/clusterevents.hpp
+++ b/lib/icinga/clusterevents.hpp
@@ -61,10 +61,6 @@ public:
 
        static Value ExecuteCommandAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
 
-       static String GetRepositoryDir(void);
-       static void RepositoryTimerHandler(void);
-       static Value UpdateRepositoryAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
-
        static Dictionary::Ptr MakeCheckResultMessage(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
 
        static void SendNotificationsHandler(const Checkable::Ptr& checkable, NotificationType type,