tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10380 from Icinga/sync-notified-problem-users-correctly

Browse Source 
ClusterEvents: Sync & process notification `notified_problem_users`
This commit is contained in:
Yonas Habteab 2025-03-18 10:27:28 +01:00 committed by GitHub
commit 5e902fe4a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/icinga/clusterevents.cpp
View File

@ -1281,6 +1281,7 @@ void ClusterEvents::NotificationSentToAllUsersHandler(const Notification::Ptr& n
params->Set("notification_number", notification->GetNotificationNumber());
params->Set("last_problem_notification", notification->GetLastProblemNotification());
params->Set("no_more_notifications", notification->GetNoMoreNotifications());
params->Set("notified_problem_users", notification->GetNotifiedProblemUsers());
Dictionary::Ptr message = new Dictionary();
message->Set("jsonrpc", "2.0");
@ -1373,12 +1374,16 @@ Value ClusterEvents::NotificationSentToAllUsersAPIHandler(const MessageOrigin::P
notification->SetLastProblemNotification(params->Get("last_problem_notification"));
notification->SetNoMoreNotifications(params->Get("no_more_notifications"));
ArrayData notifiedProblemUsers;
for (const User::Ptr& user : users) {
notifiedProblemUsers.push_back(user->GetName());
}
if (params->Contains("notified_problem_users")) {
notification->SetNotifiedProblemUsers(params->Get("notified_problem_users"));
} else {
ArrayData notifiedProblemUsers;
for (const User::Ptr& user : users) {
notifiedProblemUsers.push_back(user->GetName());
}
notification->SetNotifiedProblemUsers(new Array(std::move(notifiedProblemUsers)));
notification->SetNotifiedProblemUsers(new Array(std::move(notifiedProblemUsers)));
}
Checkable::OnNotificationSentToAllUsers(notification, checkable, users, type, cr, author, text, origin);