tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cluster: Fix notified users for NotificationSentToAllUsers event 

refs #12449
refs #12444
This commit is contained in:
Michael Friedrich 2016-08-22 10:47:09 +02:00
parent 4c419d099a
commit b8d3bcad6a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/icinga/clusterevents.cpp
View File

@ -957,7 +957,11 @@ void ClusterEvents::NotificationSentToAllUsersHandler(const Notification::Ptr& n
params->Set("service", service->GetShortName()); params->Set("service", service->GetShortName());
params->Set("notification", notification->GetName()); params->Set("notification", notification->GetName());
params->Set("users", Array::FromSet(users)); Array::Ptr ausers = new Array();
BOOST_FOREACH(const User::Ptr& user, users) {
ausers->Add(user->GetName());
}
params->Set("users", ausers);
params->Set("type", notificationType); params->Set("type", notificationType);
params->Set("cr", Serialize(cr)); params->Set("cr", Serialize(cr));
@ -1053,7 +1057,13 @@ Value ClusterEvents::NotificationSentToAllUsersAPIHandler(const MessageOrigin::P
notification->SetNotificationNumber(params->Get("notification_number")); notification->SetNotificationNumber(params->Get("notification_number"));
notification->SetLastProblemNotification(params->Get("last_problem_notification")); notification->SetLastProblemNotification(params->Get("last_problem_notification"));
notification->SetNoMoreNotifications(params->Get("no_more_notifications")); notification->SetNoMoreNotifications(params->Get("no_more_notifications"));
notification->SetNotifiedUsers(Array::FromSet(users));
Array::Ptr notifiedUsers = new Array();
BOOST_FOREACH(const User::Ptr& user, users) {
notifiedUsers->Add(user->GetName());
}
notification->SetNotifiedUsers(notifiedUsers);
Checkable::OnNotificationSentToAllUsers(notification, checkable, users, type, cr, author, text, origin); Checkable::OnNotificationSentToAllUsers(notification, checkable, users, type, cr, author, text, origin);