tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 15:44:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix that recovery notifications are sent if notified for !Problem type before

Browse Source 
fixes #13205
This commit is contained in:
Michael Friedrich 2016-11-15 15:12:26 +01:00
parent f58d3a1838
commit 35ce166bd2
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/icinga/clusterevents.cpp
View File

@ -1097,12 +1097,12 @@ Value ClusterEvents::NotificationSentToAllUsersAPIHandler(const MessageOrigin::P
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"));
Array::Ptr notifiedUsers = new Array(); Array::Ptr notifiedProblemUsers = new Array();
for (const User::Ptr& user : users) { for (const User::Ptr& user : users) {
notifiedUsers->Add(user->GetName()); notifiedProblemUsers->Add(user->GetName());
} }
notification->SetNotifiedUsers(notifiedUsers); notification->SetNotifiedProblemUsers(notifiedProblemUsers);
Checkable::OnNotificationSentToAllUsers(notification, checkable, users, type, cr, author, text, origin); Checkable::OnNotificationSentToAllUsers(notification, checkable, users, type, cr, author, text, origin);

12
lib/icinga/notification.cpp
View File

@ -386,7 +386,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
} }
std::set<User::Ptr> allNotifiedUsers; std::set<User::Ptr> allNotifiedUsers;
Array::Ptr notifiedUsers = GetNotifiedUsers(); Array::Ptr notifiedProblemUsers = GetNotifiedProblemUsers();
for (const User::Ptr& user : allUsers) { for (const User::Ptr& user : allUsers) {
String userName = user->GetName(); String userName = user->GetName();
@ -405,9 +405,9 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
/* on recovery, check if user was notified before */ /* on recovery, check if user was notified before */
if (type == NotificationRecovery) { if (type == NotificationRecovery) {
if (!notifiedUsers->Contains(userName)) { if (!notifiedProblemUsers->Contains(userName)) {
Log(LogNotice, "Notification") Log(LogNotice, "Notification")
<< "We did not notify user '" << userName << "' before. Not sending recovery notification."; << "We did not notify user '" << userName << "' for a problem before. Not sending recovery notification.";
continue; continue;
} }
} }
@ -422,13 +422,13 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
allNotifiedUsers.insert(user); allNotifiedUsers.insert(user);
/* store all notified users for later recovery checks */ /* store all notified users for later recovery checks */
if (!notifiedUsers->Contains(userName)) if (type == NotificationProblem && !notifiedProblemUsers->Contains(userName))
notifiedUsers->Add(userName); notifiedProblemUsers->Add(userName);
} }
/* if this was a recovery notification, reset all notified users */ /* if this was a recovery notification, reset all notified users */
if (type == NotificationRecovery) if (type == NotificationRecovery)
notifiedUsers->Clear(); notifiedProblemUsers->Clear();
/* used in db_ido for notification history */ /* used in db_ido for notification history */
Service::OnNotificationSentToAllUsers(this, checkable, allNotifiedUsers, type, cr, author, text, MessageOrigin::Ptr()); Service::OnNotificationSentToAllUsers(this, checkable, allNotifiedUsers, type, cr, author, text, MessageOrigin::Ptr());

2
lib/icinga/notification.ti
View File

@ -86,7 +86,7 @@ class Notification : CustomVarObject < NotificationNameComposer
}}} }}}
}; };
[state, no_user_modify] Array::Ptr notified_users { [state, no_user_modify] Array::Ptr notified_problem_users {
default {{{ return new Array(); }}} default {{{ return new Array(); }}}
}; };