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

Add an explicit flag for disabling reminder notifications 

refs #12402
This commit is contained in:
Michael Friedrich 2016-08-15 18:32:51 +02:00
parent 17544d7b54
commit d909c0945c
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/clusterevents.cpp
View File

@ -968,6 +968,7 @@ void ClusterEvents::NotificationSentToAllUsersHandler(const Notification::Ptr& n
params->Set("next_notification", notification->GetNextNotification()); params->Set("next_notification", notification->GetNextNotification());
params->Set("notification_number", notification->GetNotificationNumber()); params->Set("notification_number", notification->GetNotificationNumber());
params->Set("last_problem_notification", notification->GetLastProblemNotification()); params->Set("last_problem_notification", notification->GetLastProblemNotification());
params->Set("no_more_notifications", notification->GetNoMoreNotifications());
Dictionary::Ptr message = new Dictionary(); Dictionary::Ptr message = new Dictionary();
message->Set("jsonrpc", "2.0"); message->Set("jsonrpc", "2.0");
@ -1051,6 +1052,7 @@ Value ClusterEvents::NotificationSentAllUsersAPIHandler(const MessageOrigin::Ptr
notification->SetNextNotification(params->Get("next_notification")); notification->SetNextNotification(params->Get("next_notification"));
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->SetNotifiedUsers(Array::FromSet(users)); notification->SetNotifiedUsers(Array::FromSet(users));
Checkable::OnNotificationSentToAllUsers(notification, checkable, users, type, cr, author, text, origin); Checkable::OnNotificationSentToAllUsers(notification, checkable, users, type, cr, author, text, origin);

5
lib/icinga/notification.cpp
View File

@ -364,6 +364,11 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
double now = Utility::GetTime(); double now = Utility::GetTime();
SetLastNotification(now); SetLastNotification(now);
if (type == NotificationProblem && GetInterval() <= 0)
SetNoMoreNotifications(true);
else
SetNoMoreNotifications(false);
if (type == NotificationProblem && GetInterval() > 0) if (type == NotificationProblem && GetInterval() > 0)
SetNextNotification(now + GetInterval()); SetNextNotification(now + GetInterval());

4
lib/icinga/notification.ti
View File

@ -90,6 +90,10 @@ class Notification : CustomVarObject < NotificationNameComposer
default {{{ return new Array(); }}} default {{{ return new Array(); }}}
}; };
[state, no_user_modify] bool no_more_notifications {
default {{{ return false; }}}
};
[state] Timestamp last_notification; [state] Timestamp last_notification;
[state] Timestamp next_notification; [state] Timestamp next_notification;
[state] int notification_number; [state] int notification_number;

7
lib/notification/notificationcomponent.cpp
View File

@ -83,8 +83,11 @@ void NotificationComponent::NotificationTimerHandler(void)
if (!IcingaApplication::GetInstance()->GetEnableNotifications() || !checkable->GetEnableNotifications()) if (!IcingaApplication::GetInstance()->GetEnableNotifications() || !checkable->GetEnableNotifications())
continue; continue;
if (notification->GetInterval() <= 0 && notification->GetLastProblemNotification() > checkable->GetLastHardStateChange()) if (notification->GetInterval() <= 0 && notification->GetNoMoreNotifications()) {
Log(LogDebug, "NotificationComponent")
<< "Skipping reminder notification '" << notification->GetName() << "'. Interval is 0 and no more notifications are required.";
continue; continue;
}
if (notification->GetNextNotification() > now) if (notification->GetNextNotification() > now)
continue; continue;
@ -115,7 +118,7 @@ void NotificationComponent::NotificationTimerHandler(void)
try { try {
Log(LogNotice, "NotificationComponent") Log(LogNotice, "NotificationComponent")
<< "Attempting to send reminder notification for object '" << checkable->GetName() << "'"; << "Attempting to send reminder notification '" << notification->GetName() << "'";
notification->BeginExecuteNotification(NotificationProblem, checkable->GetLastCheckResult(), false, true); notification->BeginExecuteNotification(NotificationProblem, checkable->GetLastCheckResult(), false, true);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
Log(LogWarning, "NotificationComponent") Log(LogWarning, "NotificationComponent")