From af1f2e0c55eabc14c34b26a5195e7ae13fdf00cc Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 12 Sep 2018 17:04:11 +0200 Subject: [PATCH] Only check for Problem types in user filers for Recovery/Acknowledgement notifications refs #6047 --- lib/icinga/notification.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp index 6da7f428f..9ac006e1e 100644 --- a/lib/icinga/notification.cpp +++ b/lib/icinga/notification.cpp @@ -402,18 +402,20 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe /* on recovery, check if user was notified before */ if (type == NotificationRecovery) { - if (!notifiedProblemUsers->Contains(userName) && CheckNotificationUserFilters(NotificationProblem, user, false, false)) { + if (!notifiedProblemUsers->Contains(userName) && (NotificationProblem & user->GetTypeFilter())) { Log(LogNotice, "Notification") - << "We did not notify user '" << userName << "' for a problem before. Not sending recovery notification."; + << "We did not notify user '" << userName + << "' (Problem types enabled) for a problem before. Not sending recovery notification."; continue; } } /* on acknowledgement, check if user was notified before */ if (type == NotificationAcknowledgement) { - if (!notifiedProblemUsers->Contains(userName) && CheckNotificationUserFilters(NotificationProblem, user, false, false)) { + if (!notifiedProblemUsers->Contains(userName) && (NotificationProblem & user->GetTypeFilter())) { Log(LogNotice, "Notification") - << "We did not notify user '" << userName << "' for a problem before. Not sending acknowledgement notification."; + << "We did not notify user '" << userName + << "' (Problem types enabled) for a problem before. Not sending acknowledgement notification."; continue; } } -- 2.40.0