From c44ad7b06b1bf22586cba1aa0bef200d7cda4304 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sat, 9 Feb 2013 15:20:10 +0100 Subject: [PATCH] Implemented notification request messages, notifications dictionary for hosts/services and state-based notifications. --- .../notification/notificationcomponent.cpp | 28 +++ .../notification/notificationcomponent.h | 2 + itl/types.conf | 24 +++ lib/config/configitembuilder.cpp | 10 + lib/icinga/Makefile.am | 2 + lib/icinga/externalcommandprocessor.cpp | 27 +++ lib/icinga/externalcommandprocessor.h | 4 +- lib/icinga/host.cpp | 13 +- lib/icinga/i2-icinga.h | 1 + lib/icinga/icinga.vcxproj | 6 +- lib/icinga/notification.cpp | 17 +- lib/icinga/notification.h | 9 +- ...ons.cpp => notificationrequestmessage.cpp} | 51 ++--- lib/icinga/notificationrequestmessage.h | 46 +++++ lib/icinga/pluginnotificationtask.cpp | 20 +- lib/icinga/pluginnotificationtask.h | 6 +- lib/icinga/service-notification.cpp | 184 ++++++++++++++++++ lib/icinga/service.cpp | 24 +-- lib/icinga/service.h | 5 +- lib/remoting/endpointmanager.cpp | 2 +- 20 files changed, 410 insertions(+), 71 deletions(-) rename lib/icinga/{service-notifications.cpp => notificationrequestmessage.cpp} (55%) create mode 100644 lib/icinga/notificationrequestmessage.h create mode 100644 lib/icinga/service-notification.cpp diff --git a/components/notification/notificationcomponent.cpp b/components/notification/notificationcomponent.cpp index 7dac914c1..d4de1111f 100644 --- a/components/notification/notificationcomponent.cpp +++ b/components/notification/notificationcomponent.cpp @@ -28,6 +28,11 @@ EXPORT_COMPONENT(notification, NotificationComponent); */ void NotificationComponent::Start(void) { + m_Endpoint = Endpoint::MakeEndpoint("notification", false); + m_Endpoint->RegisterTopicHandler("icinga::SendNotifications", + boost::bind(&NotificationComponent::SendNotificationsRequestHandler, this, _2, + _3)); + m_NotificationTimer = boost::make_shared(); m_NotificationTimer->SetInterval(5); m_NotificationTimer->OnTimerExpired.connect(boost::bind(&NotificationComponent::NotificationTimerHandler, this)); @@ -50,3 +55,26 @@ void NotificationComponent::NotificationTimerHandler(void) { // TODO: implement } + + +/** + * Processes icinga::SendNotifications messages. + */ +void NotificationComponent::SendNotificationsRequestHandler(const Endpoint::Ptr& sender, + const RequestMessage& request) +{ + MessagePart params; + if (!request.GetParams(¶ms)) + return; + + String svc; + if (!params.Get("service", &svc)) + return; + + int type; + if (!params.Get("type", &type)) + return; + + Service::Ptr service = Service::GetByName(svc); + service->SendNotifications(static_cast(type)); +} diff --git a/components/notification/notificationcomponent.h b/components/notification/notificationcomponent.h index dbb2d449c..c40cd8ac1 100644 --- a/components/notification/notificationcomponent.h +++ b/components/notification/notificationcomponent.h @@ -34,8 +34,10 @@ public: private: Timer::Ptr m_NotificationTimer; + Endpoint::Ptr m_Endpoint; void NotificationTimerHandler(void); + void SendNotificationsRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request); }; } diff --git a/itl/types.conf b/itl/types.conf index 194ec627f..fb7ad5f56 100644 --- a/itl/types.conf +++ b/itl/types.conf @@ -103,6 +103,18 @@ type Host { } }, + %attribute dictionary "notifications" { + %attribute string "*", + %attribute dictionary "*" { + %require "notification", + %attribute string "notification", + + %attribute dictionary "macros" { + %attribute string "*" + } + } + }, + /* service attributes */ %attribute number "max_check_attempts", %attribute number "check_interval", @@ -172,6 +184,18 @@ type Service { %attribute dictionary "methods" { %require "check", %attribute string "check" + }, + + %attribute dictionary "notifications" { + %attribute string "*", + %attribute dictionary "*" { + %require "notification", + %attribute string "notification", + + %attribute dictionary "macros" { + %attribute string "*" + } + } } } diff --git a/lib/config/configitembuilder.cpp b/lib/config/configitembuilder.cpp index dde8c8d94..c680a6116 100644 --- a/lib/config/configitembuilder.cpp +++ b/lib/config/configitembuilder.cpp @@ -105,6 +105,16 @@ ConfigItem::Ptr ConfigItemBuilder::Compile(void) BOOST_THROW_EXCEPTION(invalid_argument(msgbuf.str())); } + BOOST_FOREACH(const String& parent, m_Parents) { + ConfigItem::Ptr item = ConfigItem::GetObject(m_Type, parent); + + if (!item) { + stringstream msgbuf; + msgbuf << "The parent config item '" + parent + "' does not exist: " << m_DebugInfo; + BOOST_THROW_EXCEPTION(invalid_argument(msgbuf.str())); + } + } + ExpressionList::Ptr exprl = boost::make_shared(); Expression execExpr("", OperatorExecute, m_ExpressionList, m_DebugInfo); diff --git a/lib/icinga/Makefile.am b/lib/icinga/Makefile.am index d0abe8003..31b3a51da 100644 --- a/lib/icinga/Makefile.am +++ b/lib/icinga/Makefile.am @@ -22,6 +22,8 @@ libicinga_la_SOURCES = \ macroprocessor.h \ notification.cpp \ notification.h \ + notificationrequestmessage.cpp \ + notificationrequestmessage.h \ nullchecktask.cpp \ nullchecktask.h \ pluginchecktask.cpp \ diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp index bf6d52a44..69c4a0b91 100644 --- a/lib/icinga/externalcommandprocessor.cpp +++ b/lib/icinga/externalcommandprocessor.cpp @@ -99,6 +99,8 @@ void ExternalCommandProcessor::Execute(double time, const String& command, const RegisterCommand("DEL_SVC_COMMENT", &ExternalCommandProcessor::DelSvcComment); RegisterCommand("DEL_ALL_HOST_COMMENTS", &ExternalCommandProcessor::DelAllHostComments); RegisterCommand("DEL_ALL_SVC_COMMENTS", &ExternalCommandProcessor::DelAllSvcComments); + RegisterCommand("SEND_CUSTOM_HOST_NOTIFICATION", &ExternalCommandProcessor::SendCustomHostNotification); + RegisterCommand("SEND_CUSTOM_SVC_NOTIFICATION", &ExternalCommandProcessor::SendCustomSvcNotification); m_Initialized = true; } @@ -799,3 +801,28 @@ void ExternalCommandProcessor::DelAllSvcComments(double, const vector& a Logger::Write(LogInformation, "icinga", "Removing all comments for service " + service->GetName()); service->RemoveAllComments(); } + +void ExternalCommandProcessor::SendCustomHostNotification(double time, const vector& arguments) +{ + if (arguments.size() < 4) + BOOST_THROW_EXCEPTION(invalid_argument("Expected 4 arguments.")); + + Host::Ptr host = Host::GetByName(arguments[0]); + + Logger::Write(LogInformation, "icinga", "Sending custom notification for host " + host->GetName()); + Service::Ptr service = host->GetHostCheckService(); + if (service) { + service->RequestNotifications(NotificationCustom); + } +} + +void ExternalCommandProcessor::SendCustomSvcNotification(double time, const vector& arguments) +{ + if (arguments.size() < 5) + BOOST_THROW_EXCEPTION(invalid_argument("Expected 5 arguments.")); + + Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + + Logger::Write(LogInformation, "icinga", "Sending custom notification for service " + service->GetName()); + service->RequestNotifications(NotificationCustom); +} diff --git a/lib/icinga/externalcommandprocessor.h b/lib/icinga/externalcommandprocessor.h index 49a3e5da9..755c36b27 100644 --- a/lib/icinga/externalcommandprocessor.h +++ b/lib/icinga/externalcommandprocessor.h @@ -22,7 +22,7 @@ namespace icinga { - + class I2_ICINGA_API ExternalCommandProcessor { public: static void Execute(const String& line); @@ -70,6 +70,8 @@ public: static void DelSvcComment(double time, const vector& arguments); static void DelAllHostComments(double time, const vector& arguments); static void DelAllSvcComments(double time, const vector& arguments); + static void SendCustomHostNotification(double time, const vector& arguments); + static void SendCustomSvcNotification(double time, const vector& arguments); private: typedef function& arguments)> Callback; diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp index 8f5bc0899..48a14a829 100644 --- a/lib/icinga/host.cpp +++ b/lib/icinga/host.cpp @@ -152,7 +152,7 @@ template static void CopyServiceAttributes(TDict serviceDesc, const ConfigItemBuilder::Ptr& builder) { /* TODO: we only need to copy macros if this is an inline definition, - * i.e. host->GetProperties() != service, however for now we just + * i.e. "typeid(serviceDesc)" != Service, however for now we just * copy them anyway. */ Value macros = serviceDesc->Get("macros"); if (!macros.IsEmpty()) @@ -194,7 +194,7 @@ void Host::UpdateSlaveServices(void) if (!item || IsAbstract()) return; - Dictionary::Ptr oldServices = Get("convenience_services"); + Dictionary::Ptr oldServices = Get("slave_services"); Dictionary::Ptr newServices; newServices = boost::make_shared(); @@ -212,7 +212,7 @@ void Host::UpdateSlaveServices(void) ConfigItemBuilder::Ptr builder = boost::make_shared(item->GetDebugInfo()); builder->SetType("Service"); builder->SetName(name); - builder->AddExpression("host_name", OperatorSet, item->GetName()); + builder->AddExpression("host_name", OperatorSet, GetName()); builder->AddExpression("alias", OperatorSet, svcname); builder->AddExpression("short_name", OperatorSet, svcname); @@ -252,7 +252,7 @@ void Host::UpdateSlaveServices(void) } } - Set("convenience_services", newServices); + Set("slave_services", newServices); } void Host::OnAttributeChanged(const String& name, const Value&) @@ -261,6 +261,11 @@ void Host::OnAttributeChanged(const String& name, const Value&) HostGroup::InvalidateMembersCache(); else if (name == "services") UpdateSlaveServices(); + else if (name == "notifications") { + BOOST_FOREACH(const Service::Ptr& service, GetServices()) { + service->UpdateSlaveNotifications(); + } + } } set Host::GetServices(void) const diff --git a/lib/icinga/i2-icinga.h b/lib/icinga/i2-icinga.h index 603b60fd2..5ca4070f6 100644 --- a/lib/icinga/i2-icinga.h +++ b/lib/icinga/i2-icinga.h @@ -47,6 +47,7 @@ using boost::algorithm::is_any_of; #include "icingaapplication.h" #include "notification.h" +#include "notificationrequestmessage.h" #include "host.h" #include "hostgroup.h" diff --git a/lib/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj index 36f5028aa..dbb7a8fbf 100644 --- a/lib/icinga/icinga.vcxproj +++ b/lib/icinga/icinga.vcxproj @@ -33,10 +33,11 @@ + - + @@ -52,6 +53,7 @@ + @@ -208,4 +210,4 @@ - \ No newline at end of file + diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp index a52914a4e..905e85723 100644 --- a/lib/icinga/notification.cpp +++ b/lib/icinga/notification.cpp @@ -25,10 +25,14 @@ REGISTER_TYPE(Notification, NULL); Notification::Notification(const Dictionary::Ptr& properties) : DynamicObject(properties) -{ } +{ + Service::InvalidateNotificationsCache(); +} Notification::~Notification(void) -{ } +{ + Service::InvalidateNotificationsCache(); +} bool Notification::Exists(const String& name) { @@ -66,13 +70,20 @@ Dictionary::Ptr Notification::GetMacros(void) const return Get("macros"); } -void Notification::SendNotification(void) +void Notification::SendNotification(NotificationType type) { vector arguments; arguments.push_back(static_cast(GetSelf())); + arguments.push_back(type); ScriptTask::Ptr task; task = InvokeMethod("notify", arguments, boost::bind(&Notification::NotificationCompletedHandler, this, _1)); + if (!task) { + Logger::Write(LogWarning, "icinga", "Notification object '" + GetName() + "' doesn't have a 'notify' method."); + + return; + } + if (!task->IsFinished()) { /* We need to keep the task object alive until the completion handler is called. */ diff --git a/lib/icinga/notification.h b/lib/icinga/notification.h index aa97d3fcf..f91ca946c 100644 --- a/lib/icinga/notification.h +++ b/lib/icinga/notification.h @@ -30,8 +30,11 @@ namespace icinga */ enum NotificationType { - NotificationHost, - NotificationService + NotificationDowntimeStart, + NotificationDowntimeEnd, + NotificationDowntimeRemoved, + NotificationCustom, + NotificationStateChange }; class Service; @@ -57,7 +60,7 @@ public: String GetNotificationCommand(void) const; Dictionary::Ptr GetMacros(void) const; - void SendNotification(void); + void SendNotification(NotificationType type); private: set m_Tasks; diff --git a/lib/icinga/service-notifications.cpp b/lib/icinga/notificationrequestmessage.cpp similarity index 55% rename from lib/icinga/service-notifications.cpp rename to lib/icinga/notificationrequestmessage.cpp index 9cba9f905..dc530e3a9 100644 --- a/lib/icinga/service-notifications.cpp +++ b/lib/icinga/notificationrequestmessage.cpp @@ -21,53 +21,26 @@ using namespace icinga; -map > Service::m_NotificationsCache; -bool Service::m_NotificationsCacheValid; - -void Service::SendNotifications(void) const +String NotificationRequestMessage::GetService(void) const { - BOOST_FOREACH(const Notification::Ptr& notification, GetNotifications()) { - notification->SendNotification(); - } + String service; + Get("service", &service); + return service; } -void Service::InvalidateNotificationsCache(void) +void NotificationRequestMessage::SetService(const String& service) { - m_NotificationsCacheValid = false; - m_NotificationsCache.clear(); + Set("service", service); } -void Service::ValidateNotificationsCache(void) +NotificationType NotificationRequestMessage::GetType(void) const { - if (m_NotificationsCacheValid) - return; - - m_NotificationsCache.clear(); - - DynamicObject::Ptr object; - BOOST_FOREACH(tie(tuples::ignore, object), DynamicType::GetByName("Notification")->GetObjects()) { - const Notification::Ptr& notification = static_pointer_cast(object); - - m_NotificationsCache[notification->GetService()->GetName()].insert(notification); - } - - m_NotificationsCacheValid = true; + int type; + Get("type", &type); + return static_cast(type); } -set Service::GetNotifications(void) const +void NotificationRequestMessage::SetType(NotificationType type) { - set notifications; - - ValidateNotificationsCache(); - - BOOST_FOREACH(const Notification::WeakPtr& wservice, m_NotificationsCache[GetName()]) { - Notification::Ptr notification = wservice.lock(); - - if (!notification) - continue; - - notifications.insert(notification); - } - - return notifications; + Set("type", type); } diff --git a/lib/icinga/notificationrequestmessage.h b/lib/icinga/notificationrequestmessage.h new file mode 100644 index 000000000..be4889abf --- /dev/null +++ b/lib/icinga/notificationrequestmessage.h @@ -0,0 +1,46 @@ +/****************************************************************************** + * Icinga 2 * + * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) * + * * + * 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. * + ******************************************************************************/ + +#ifndef NOTIFICATIONREQUESTMESSAGE_H +#define NOTIFICATIONREQUESTMESSAGE_H + +namespace icinga +{ + +/** + * An API request for sending notifications. + * + * @ingroup icinga + */ +class I2_ICINGA_API NotificationRequestMessage : public MessagePart +{ +public: + NotificationRequestMessage(void) : MessagePart() { } + NotificationRequestMessage(const MessagePart& message) : MessagePart(message) { } + + String GetService(void) const; + void SetService(const String& service); + + NotificationType GetType(void) const; + void SetType(NotificationType type); +}; + +} + +#endif /* NOTIFICATIONREQUESTMESSAGE_H */ diff --git a/lib/icinga/pluginnotificationtask.cpp b/lib/icinga/pluginnotificationtask.cpp index 1387e6696..8bec5e77c 100644 --- a/lib/icinga/pluginnotificationtask.cpp +++ b/lib/icinga/pluginnotificationtask.cpp @@ -23,8 +23,9 @@ using namespace icinga; REGISTER_SCRIPTFUNCTION("native::PluginNotification", &PluginNotificationTask::ScriptFunc); -PluginNotificationTask::PluginNotificationTask(const ScriptTask::Ptr& task, const Process::Ptr& process) - : m_Task(task), m_Process(process) +PluginNotificationTask::PluginNotificationTask(const ScriptTask::Ptr& task, const Process::Ptr& process, + const String& service, const String& command) + : m_Task(task), m_Process(process), m_ServiceName(service), m_Command(command) { } void PluginNotificationTask::ScriptFunc(const ScriptTask::Ptr& task, const vector& arguments) @@ -32,10 +33,14 @@ void PluginNotificationTask::ScriptFunc(const ScriptTask::Ptr& task, const vecto if (arguments.size() < 1) BOOST_THROW_EXCEPTION(invalid_argument("Missing argument: Notification target must be specified.")); + if (arguments.size() < 2) + BOOST_THROW_EXCEPTION(invalid_argument("Missing argument: Notification type must be specified.")); + if (!arguments[0].IsObjectType()) BOOST_THROW_EXCEPTION(invalid_argument("Argument must be a service.")); Notification::Ptr notification = arguments[0]; + NotificationType type = static_cast(static_cast(arguments[1])); String notificationCommand = notification->GetNotificationCommand(); @@ -48,7 +53,7 @@ void PluginNotificationTask::ScriptFunc(const ScriptTask::Ptr& task, const vecto Process::Ptr process = boost::make_shared(command); - PluginNotificationTask ct(task, process); + PluginNotificationTask ct(task, process, notification->GetService()->GetName(), command); process->Start(boost::bind(&PluginNotificationTask::ProcessFinishedHandler, ct)); } @@ -60,8 +65,13 @@ void PluginNotificationTask::ProcessFinishedHandler(PluginNotificationTask ct) try { pr = ct.m_Process->GetResult(); - if (pr.ExitStatus != 0) - Logger::Write(LogWarning, "icinga", "Notification command failed; output: " + pr.Output); + if (pr.ExitStatus != 0) { + stringstream msgbuf; + msgbuf << "Notification command '" << ct.m_Command << "' for service '" + << ct.m_ServiceName << "' failed; exit status: " + << pr.ExitStatus << ", output: " << pr.Output; + Logger::Write(LogWarning, "icinga", msgbuf.str()); + } ct.m_Task->FinishResult(Empty); } catch (...) { diff --git a/lib/icinga/pluginnotificationtask.h b/lib/icinga/pluginnotificationtask.h index 11b4284df..bf39f12c7 100644 --- a/lib/icinga/pluginnotificationtask.h +++ b/lib/icinga/pluginnotificationtask.h @@ -37,10 +37,14 @@ private: static void ProcessFinishedHandler(PluginNotificationTask ct); - PluginNotificationTask(const ScriptTask::Ptr& task, const Process::Ptr& process); + PluginNotificationTask(const ScriptTask::Ptr& task, const Process::Ptr& process, + const String& service, const String& command); ScriptTask::Ptr m_Task; Process::Ptr m_Process; + + String m_ServiceName; + String m_Command; }; } diff --git a/lib/icinga/service-notification.cpp b/lib/icinga/service-notification.cpp new file mode 100644 index 000000000..fb7ab4fe4 --- /dev/null +++ b/lib/icinga/service-notification.cpp @@ -0,0 +1,184 @@ +/****************************************************************************** + * Icinga 2 * + * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) * + * * + * 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. * + ******************************************************************************/ + +#include "i2-icinga.h" + +using namespace icinga; + +map > Service::m_NotificationsCache; +bool Service::m_NotificationsCacheValid; + +void Service::RequestNotifications(NotificationType type) const +{ + RequestMessage msg; + msg.SetMethod("icinga::SendNotifications"); + + NotificationRequestMessage params; + msg.SetParams(params); + + params.SetService(GetName()); + params.SetType(type); + + Logger::Write(LogInformation, "icinga", "Sending notification anycast request for service '" + GetName() + "'"); + EndpointManager::GetInstance()->SendAnycastMessage(Endpoint::Ptr(), msg); +} + +void Service::SendNotifications(NotificationType type) const +{ + Logger::Write(LogInformation, "icinga", "Sending notifications for service '" + GetName() + "'"); + + set notifications = GetNotifications(); + + if (notifications.size() == 0) + Logger::Write(LogInformation, "icinga", "Service '" + GetName() + "' does not have any notifications."); + + BOOST_FOREACH(const Notification::Ptr& notification, notifications) { + notification->SendNotification(type); + } +} + +void Service::InvalidateNotificationsCache(void) +{ + m_NotificationsCacheValid = false; + m_NotificationsCache.clear(); +} + +void Service::ValidateNotificationsCache(void) +{ + if (m_NotificationsCacheValid) + return; + + m_NotificationsCache.clear(); + + DynamicObject::Ptr object; + BOOST_FOREACH(tie(tuples::ignore, object), DynamicType::GetByName("Notification")->GetObjects()) { + const Notification::Ptr& notification = static_pointer_cast(object); + + m_NotificationsCache[notification->GetService()->GetName()].insert(notification); + } + + m_NotificationsCacheValid = true; +} + +set Service::GetNotifications(void) const +{ + set notifications; + + ValidateNotificationsCache(); + + BOOST_FOREACH(const Notification::WeakPtr& wservice, m_NotificationsCache[GetName()]) { + Notification::Ptr notification = wservice.lock(); + + if (!notification) + continue; + + notifications.insert(notification); + } + + return notifications; +} + +template +static void CopyNotificationAttributes(TDict notificationDesc, const ConfigItemBuilder::Ptr& builder) +{ + /* TODO: we only need to copy macros if this is an inline definition, + * i.e. "typeid(notificationDesc)" != Notification, however for now we just + * copy them anyway. */ + Value macros = notificationDesc->Get("macros"); + if (!macros.IsEmpty()) + builder->AddExpression("macros", OperatorPlus, macros); + + /*Value notificationInterval = notificationDesc->Get("notification_interval"); + if (!notificationInterval.IsEmpty()) + builder->AddExpression("notification_interval", OperatorSet, notificationInterval);*/ +} + +void Service::UpdateSlaveNotifications(void) +{ + ConfigItem::Ptr item = ConfigItem::GetObject("Service", GetName()); + + /* Don't create slave notifications unless we own this object + * and it's not a template. */ + if (!item || IsAbstract()) + return; + + Dictionary::Ptr oldNotifications = Get("slave_notifications"); + + Dictionary::Ptr newNotifications; + newNotifications = boost::make_shared(); + + vector notificationDescsList; + notificationDescsList.push_back(GetHost()->Get("notifications")); + notificationDescsList.push_back(Get("notifications")); + + BOOST_FOREACH(const Dictionary::Ptr& notificationDescs, notificationDescsList) { + if (!notificationDescs) + continue; + + String nfcname; + Value nfcdesc; + BOOST_FOREACH(tie(nfcname, nfcdesc), notificationDescs) { + stringstream namebuf; + namebuf << GetName() << "-" << nfcname; + String name = namebuf.str(); + + ConfigItemBuilder::Ptr builder = boost::make_shared(item->GetDebugInfo()); + builder->SetType("Notification"); + builder->SetName(name); + builder->AddExpression("host_name", OperatorSet, GetHost()->GetName()); + builder->AddExpression("service", OperatorSet, GetName()); + + CopyNotificationAttributes(this, builder); + + if (nfcdesc.IsScalar()) { + builder->AddParent(nfcdesc); + } else if (nfcdesc.IsObjectType()) { + Dictionary::Ptr notification = nfcdesc; + + String parent = notification->Get("notification"); + if (parent.IsEmpty()) + parent = nfcname; + + builder->AddParent(parent); + + CopyNotificationAttributes(notification, builder); + } else { + BOOST_THROW_EXCEPTION(invalid_argument("Notification description must be either a string or a dictionary.")); + } + + ConfigItem::Ptr notificationItem = builder->Compile(); + notificationItem->Commit(); + + newNotifications->Set(name, notificationItem); + } + } + + if (oldNotifications) { + ConfigItem::Ptr notification; + BOOST_FOREACH(tie(tuples::ignore, notification), oldNotifications) { + if (!notification) + continue; + + if (!newNotifications->Contains(notification->GetName())) + notification->Unregister(); + } + } + + Set("slave_notifications", newNotifications); +} diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp index 88f5e2df3..a97a18442 100644 --- a/lib/icinga/service.cpp +++ b/lib/icinga/service.cpp @@ -529,17 +529,11 @@ void Service::ApplyCheckResult(const Dictionary::Ptr& cr) SetLastCheckResult(cr); - // TODO(debug): remove this - SendNotifications(); + double now = Utility::GetTime(); if (old_state != GetState()) { - double now = Utility::GetTime(); - SetLastStateChange(now); - if (old_stateType != GetStateType()) - SetLastHardStateChange(now); - /* remove acknowledgements */ if (GetAcknowledgement() == AcknowledgementNormal || (GetAcknowledgement() == AcknowledgementSticky && GetStateType() == StateTypeHard && GetState() == StateOK)) { @@ -560,11 +554,19 @@ void Service::ApplyCheckResult(const Dictionary::Ptr& cr) service->SetNextCheck(Utility::GetTime()); } - // TODO: notify our child services/hosts that our state has changed + if (GetState() != StateOK) + TriggerDowntimes(); } - if (GetState() != StateOK) - TriggerDowntimes(); + if (GetStateType() == StateTypeHard && (old_state != GetState() || old_stateType == StateTypeSoft)) { + SetLastHardStateChange(now); + + /* Make sure the notification component sees the updated + * state/state_type attributes. */ + DynamicObject::FlushTx(); + + RequestNotifications(NotificationStateChange); + } } ServiceState Service::StateFromString(const String& state) @@ -645,7 +647,7 @@ void Service::OnAttributeChanged(const String& name, const Value& oldValue) else if (name == "comments") Service::InvalidateCommentCache(); else if (name == "notifications") - Service::InvalidateNotificationsCache(); + UpdateSlaveNotifications(); } void Service::BeginExecuteCheck(const function& callback) diff --git a/lib/icinga/service.h b/lib/icinga/service.h index 0d3cf176f..e136a26a1 100644 --- a/lib/icinga/service.h +++ b/lib/icinga/service.h @@ -223,13 +223,16 @@ public: static void ValidateCommentCache(void); /* Notifications */ - void SendNotifications(void) const; + void RequestNotifications(NotificationType type) const; + void SendNotifications(NotificationType type) const; static void InvalidateNotificationsCache(void); static void ValidateNotificationsCache(void); set GetNotifications(void) const; + void UpdateSlaveNotifications(void); + protected: virtual void OnAttributeChanged(const String& name, const Value& oldValue); diff --git a/lib/remoting/endpointmanager.cpp b/lib/remoting/endpointmanager.cpp index ebb90c795..9654ccbd1 100644 --- a/lib/remoting/endpointmanager.cpp +++ b/lib/remoting/endpointmanager.cpp @@ -236,7 +236,7 @@ void EndpointManager::SendAnycastMessage(const Endpoint::Ptr& sender, BOOST_FOREACH(tie(tuples::ignore, object), DynamicType::GetByName("Endpoint")->GetObjects()) { Endpoint::Ptr endpoint = dynamic_pointer_cast(object); /* don't forward messages between non-local endpoints */ - if (!sender->IsLocal() && !endpoint->IsLocal()) + if ((sender && !sender->IsLocal()) && !endpoint->IsLocal()) continue; if (endpoint->HasSubscription(method))