daily autocommit

diff --git a/icinga2-classicui/htpasswd.users b/icinga2-classicui/htpasswd.users
index 235cff84ddb886abfaea0dfa11d39c292d411142..66df579431f5732868c8db76784b795d2d1a7093 100644 (file)
--- a/icinga2-classicui/htpasswd.users
+++ b/icinga2-classicui/htpasswd.users
@@ -1 +1,2 @@
 icingaadmin:$apr1$iFfKiuLF$nwExYtTK3UsmVYHYTzllL/
+frank:$2y$05$Ys9DHq2M/dWa8jJckfBsfOss9wGdA6Ql2cJwALvpVea1hmHmpnNuG

diff --git a/icinga2/conf.d/hosts.conf b/icinga2/conf.d/hosts.conf
index 5ff1f9b615553cfe714389eb8377170151bbe4f4..0fe2efd0316073ff561f93519845a84191e1587c 100644 (file)
--- a/icinga2/conf.d/hosts.conf
+++ b/icinga2/conf.d/hosts.conf
@@ -42,6 +42,18 @@ object Host NodeName {
   vars.disks["disk /"] = {
     disk_partitions = "/"
   }
+  vars.disks["disk /home"] = {
+    disk_partitions = "/home"
+  }
+  vars.disks["disk /tmp"] = {
+    disk_partitions = "/tmp"
+  }
+  vars.disks["disk /var"] = {
+    disk_partitions = "/var"
+  }
+  vars.disks["disk /var/backup"] = {
+    disk_partitions = "/var/backup"
+  }
 
   /* Define notification mail attributes for notification apply rules in `notifications.conf`. */
   vars.notification["mail"] = {

diff --git a/icinga2/conf.d/services.conf b/icinga2/conf.d/services.conf
index 416915bc07928fbd5419e9ee35f9d0d7a422308a..e459407173d384a958f40856c030b093e679a247 100644 (file)
--- a/icinga2/conf.d/services.conf
+++ b/icinga2/conf.d/services.conf
@@ -97,6 +97,26 @@ apply Service "procs" {
   assign where host.name == NodeName
 }
 
+apply Service "proc named" {
+  import "generic-service"
+
+  check_command = "procs"
+  vars.procs_argument = "/usr/sbin/named"
+  vars.procs_ppid = 1
+  #vars.procs_warning = '1:1'
+  #vars.procs_critical = '1:1'
+  vars.procs_user = 'named'
+  #vars = {
+  #  procs_argument = "/usr/sbin/named"
+  #  procs_ppid = 1
+  #  procs_warning = '1:1'
+  #  procs_critical = '1:1'
+  #  procs_user = 'named'
+  #}
+
+  assign where host.name == NodeName
+}
+
 apply Service "swap" {
   import "generic-service"
 

diff --git a/icinga2/conf.d/users.conf b/icinga2/conf.d/users.conf
index aa31e272eb7a9d655ee10159f1d97b5f31b394ea..034ba629caaadd815a46a9fd4ca495ce9af62e09 100644 (file)
--- a/icinga2/conf.d/users.conf
+++ b/icinga2/conf.d/users.conf
@@ -10,6 +10,26 @@ object User "icingaadmin" {
   groups = [ "icingaadmins" ]
 
   email = "root@localhost"
+  enable_notifications = false
+
+}
+
+object User "frank" {
+  import "generic-user"
+
+  display_name = "Frank Brehm"
+  groups = [ "icingaadmins" ]
+
+  email = "frank@brehm-online.com"
+}
+
+object User "frank_by_gmx" {
+  import "generic-user"
+
+  display_name = "Frank Brehm by GMX"
+  groups = [ "icingaadmins" ]
+
+  email = "frank.brehm@gmx.net"
 }
 
 object UserGroup "icingaadmins" {