wip

bundles/icinga2/files/conf.d/groups.conf

@@ -8,12 +8,6 @@ object HostGroup "linux-servers" {
   assign where host.vars.os == "Linux"
 }
 
-object HostGroup "windows-servers" {
-  display_name = "Windows Servers"
-
-  assign where host.vars.os == "Windows"
-}
-
 /**
  * Service group examples.
  */
@@ -35,3 +29,11 @@ object ServiceGroup "disk" {
 
   assign where match("disk*", service.check_command)
 }
+
+/**
+ * User group examples.
+ */
+
+object UserGroup "notifyable" {
+    display_name = "Notifyable Users"
+}

bundles/icinga2/files/conf.d/notifications.conf

@@ -1,33 +1,13 @@
-/**
+apply Notification "service-critical-mail" to Service {
- * The example notification apply rules.
+  command = "mail-service-notification"
- *
+  user_groups = [ "notifyable" ]
- * Only applied if host/service objects have
- * the custom variable `notification` defined
- * and containing `mail` as key.
- *
- * Check `hosts.conf` for an example.
- */
 
-apply Notification "mail-icingaadmin" to Host {
+  assign where host.vars.notification.mail != false
-  import "mail-host-notification"
-  user_groups = host.vars.notification.mail.groups
-  users = host.vars.notification.mail.users
-
-  //interval = 2h
-
-  //vars.notification_logtosyslog = true
-
-  assign where host.vars.notification.mail
 }
 
-apply Notification "mail-icingaadmin" to Service {
+apply Notification "service-critical-push" to Service {
-  import "mail-service-notification"
+  command = "mail-service-notification"
-  user_groups = host.vars.notification.mail.groups
+  users = [ "Push-Notifications" ]
-  users = host.vars.notification.mail.users
 
-  //interval = 2h
+  assign where host.vars.notification.push != false
-
-  //vars.notification_logtosyslog = true
-
-  assign where host.vars.notification.mail
 }

bundles/icinga2/files/conf.d/users.conf

@@ -0,0 +1,24 @@
+object User "Admin" {
+  import "generic-user"
+
+  groups = [ "notifyable" ]
+  display_name = "Admin"
+  email = "icinga2@freibrief.n"
+  enable_notifications = true
+  states = [ Warning, Critical ]
+  types = [ Problem, Acknowledgement, Recovery, Custom,
+  FlappingStart, FlappingEnd,
+  DowntimeStart, DowntimeEnd, DowntimeRemoved ]
+}
+
+object User "Push-Notifications" {
+  import "generic-user"
+
+  display_name = "Push-Notifications"
+  email = "cjb3uuhkaa@pomail.net"
+  enable_notifications = true
+  states = [ Warning, Critical ]
+  types = [ Problem, Acknowledgement, Recovery, Custom,
+  FlappingStart, FlappingEnd,
+  DowntimeStart, DowntimeEnd, DowntimeRemoved ]
+}

bundles/icinga2/items.py

@@ -156,6 +156,16 @@ files = {
             'svc_systemd:icinga2.service:restart',
         ],
     },
+    '/etc/icinga2/conf.d/users.conf': {
+        'source': 'conf.d/users.conf',
+        'content_type': 'mako',
+        'owner': 'nagios',
+        'group': 'nagios',
+        'mode': '0640',
+        'triggers': [
+            'svc_systemd:icinga2.service:restart',
+        ],
+    },
     '/etc/icinga2/conf.d/groups.conf': {
         'source': 'conf.d/groups.conf',
         'content_type': 'mako',