From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 20 Sep 2017 04:26:20 +0000 (+0200)
Subject: daily autocommit
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=21809264d4bb3c1bbef8a031cccde1a7772e5d9b;p=config%2Fns1%2Fetc.git

daily autocommit
---

diff --git a/icinga2-classicui/htpasswd.users b/icinga2-classicui/htpasswd.users
index 235cff8..66df579 100644
--- 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 5ff1f9b..0fe2efd 100644
--- 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 416915b..e459407 100644
--- 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 aa31e27..034ba62 100644
--- 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" {