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

Still notify on acknowledgement and recovery if user does not get problem notifications at all

Browse Source 
refs #6047
This commit is contained in:
Noah Hilverling 2018-09-04 13:11:28 +02:00 committed by Michael Friedrich
parent bfe7d46a68
commit 834e37d3e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/icinga/notification.cpp
View File

@ -402,7 +402,7 @@ 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 (!notifiedProblemUsers->Contains(userName)) { if (!notifiedProblemUsers->Contains(userName) && CheckNotificationUserFilters(NotificationProblem, user, false, false)) {
Log(LogNotice, "Notification") Log(LogNotice, "Notification")
<< "We did not notify user '" << userName << "' for a problem before. Not sending recovery notification."; << "We did not notify user '" << userName << "' for a problem before. Not sending recovery notification.";
continue; continue;
@ -411,7 +411,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
/* on acknowledgement, check if user was notified before */ /* on acknowledgement, check if user was notified before */
if (type == NotificationAcknowledgement) { if (type == NotificationAcknowledgement) {
if (!notifiedProblemUsers->Contains(userName)) { if (!notifiedProblemUsers->Contains(userName) && CheckNotificationUserFilters(NotificationProblem, user, false, false)) {
Log(LogNotice, "Notification") Log(LogNotice, "Notification")
<< "We did not notify user '" << userName << "' for a problem before. Not sending acknowledgement notification."; << "We did not notify user '" << userName << "' for a problem before. Not sending acknowledgement notification.";
continue; continue;