Make default notifications include users from host.vars.notification.mail.users

fixes #8830

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>

diff --git a/doc/5-configuring-icinga-2.md b/doc/5-configuring-icinga-2.md
index 054d23cf2afcab87c569e6c5810e88cb8f7df3d8..094ea40ee15eb3df102778c8bd60e89e6fc9d66a 100644 (file)
--- a/doc/5-configuring-icinga-2.md
+++ b/doc/5-configuring-icinga-2.md
@@ -482,6 +482,7 @@ implicitely use the`icingaadmins` UserGroup defined in [users.conf](5-configurin
       import "mail-host-notification"
 
       user_groups = host.vars.notification.mail.groups
+      users = host.vars.notification.mail.users
 
       assign where host.vars.notification.mail
     }
@@ -490,6 +491,7 @@ implicitely use the`icingaadmins` UserGroup defined in [users.conf](5-configurin
       import "mail-service-notification"
 
       user_groups = host.vars.notification.mail.groups
+      users = host.vars.notification.mail.users
 
       assign where host.vars.notification.mail
     }

diff --git a/etc/icinga2/conf.d/notifications.conf b/etc/icinga2/conf.d/notifications.conf
index fd3af731863914454271117394c3c1edd6dc2b01..73f0f5f66334a74e55107bacc7f2fd5d48cda3fa 100644 (file)
--- a/etc/icinga2/conf.d/notifications.conf
+++ b/etc/icinga2/conf.d/notifications.conf
@@ -12,6 +12,7 @@ apply Notification "mail-icingaadmin" to Host {
   import "mail-host-notification"
 
   user_groups = host.vars.notification.mail.groups
+  users = host.vars.notification.mail.users
 
   assign where host.vars.notification.mail
 }
@@ -20,6 +21,7 @@ apply Notification "mail-icingaadmin" to Service {
   import "mail-service-notification"
 
   user_groups = host.vars.notification.mail.groups
+  users = host.vars.notification.mail.users
 
   assign where host.vars.notification.mail
 }