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

Notification#BeginExecuteNotification(): track state change notifications

Browse Source
This commit is contained in:
Alexander A. Klimov 2023-06-14 12:48:22 +02:00
parent 2d167ccd28
commit b25ba7a316
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/notification.cpp
View File

@ -452,6 +452,16 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
/* collect all notified users */ /* collect all notified users */
allNotifiedUsers.insert(user); allNotifiedUsers.insert(user);
switch (type) {
case NotificationProblem:
case NotificationRecovery: {
auto [host, service] = GetHostService(checkable);
GetLastNotifiedStatePerUser()->Set(userName, service ? service->GetState() : host->GetState());
}
default:
;
}
/* store all notified users for later recovery checks */ /* store all notified users for later recovery checks */
if (type == NotificationProblem && !notifiedProblemUsers->Contains(userName)) if (type == NotificationProblem && !notifiedProblemUsers->Contains(userName))
notifiedProblemUsers->Add(userName); notifiedProblemUsers->Add(userName);

4
lib/icinga/notification.ti
View File

@ -90,6 +90,10 @@ class Notification : CustomVarObject < NotificationNameComposer
default {{{ return 0; }}} default {{{ return 0; }}}
}; };
[state, no_user_view, no_user_modify] Dictionary::Ptr last_notified_state_per_user {
default {{{ return new Dictionary(); }}}
};
[config, navigation] name(Endpoint) command_endpoint (CommandEndpointRaw) { [config, navigation] name(Endpoint) command_endpoint (CommandEndpointRaw) {
navigate {{{ navigate {{{
return Endpoint::GetByName(GetCommandEndpointRaw()); return Endpoint::GetByName(GetCommandEndpointRaw());