Add generic-user template.

Fixes #5236

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 00c07c9c2f959554b8c5ebc591c1ab5feab96e84..99a3bba6230d39a8408eac8d6feedc978744a7f1 100644 (file)
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -22,6 +22,7 @@ configure_file(icinga/icinga-classic-apache.conf.cmake ${CMAKE_CURRENT_BINARY_DI
 install_if_not_exists(icinga2/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
 install_if_not_exists(icinga2/conf.d/generic-host.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/generic-service.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
+install_if_not_exists(icinga2/conf.d/generic-user.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/groups.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/localhost.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/macros.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)

diff --git a/etc/icinga2/conf.d/generic-user.conf b/etc/icinga2/conf.d/generic-user.conf
new file mode 100644 (file)
index 0000000..f25e2f7
--- /dev/null
+++ b/etc/icinga2/conf.d/generic-user.conf
@@ -0,0 +1,22 @@
+/**
+ * Provides default settings for users. By convention
+ * all users should inherit from this template.
+ */
+
+template User "generic-user" {
+  enable_notifications = 1,
+  notification_period = "24x7",
+
+  notification_state_filter = (StateFilterWarning |
+                               StateFilterCritical |
+                               StateFilterUnknown),
+  notification_type_filter = (NotificationFilterProblem |
+                              NotificationFilterAcknowledgement |
+                              NotificationFilterRecovery |
+                              NotificationFilterCustom |
+                              NotificationFilterFlappingStart |
+                              NotificationFilterFlappingEnd |
+                              NotificationFilterDowntimeStart |
+                              NotificationFilterDowntimeEnd |
+                              NotificationFilterDowntimeRemoved)
+}

diff --git a/etc/icinga2/conf.d/users.conf b/etc/icinga2/conf.d/users.conf
index b8010799365e98feb915f5250f1c94ce47561bda..953a9b9033bcfeb075718aa625bd8cc3b50dc5ea 100644 (file)
--- a/etc/icinga2/conf.d/users.conf
+++ b/etc/icinga2/conf.d/users.conf
@@ -3,26 +3,10 @@
  * group 'icingaadmins'.
  */
 
-object User "icingaadmin" {
+object User "icingaadmin" inherits "generic-user" {
   display_name = "Icinga 2 Admin",
   groups = [ "icingaadmins" ],
 
-  enable_notifications = 1,
-  notification_period = "24x7",
-
-  notification_state_filter = (StateFilterWarning |
-                               StateFilterCritical |
-                               StateFilterUnknown),
-  notification_type_filter = (NotificationFilterProblem |
-                              NotificationFilterAcknowledgement |
-                              NotificationFilterRecovery |
-                              NotificationFilterCustom |
-                              NotificationFilterFlappingStart |
-                              NotificationFilterFlappingEnd |
-                              NotificationFilterDowntimeStart |
-                              NotificationFilterDowntimeEnd |
-                              NotificationFilterDowntimeRemoved),
-
   macros = {
     "name" = "Icinga 2 Admin",
     "email" = "icinga@localhost",