saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index dda1b3266417271040525214aea90776090d1664..8276ee1e02de3e10e27e280735d41e9505176a3e 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -251,6 +251,7 @@ maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key2.pub'
 maybe chmod 0644 'apt/sources.list'
 maybe chmod 0755 'apt/sources.list.d'
 maybe chmod 0644 'apt/sources.list.d/fbrehm.list'
+maybe chmod 0644 'apt/sources.list.d/icinga.list'
 maybe chmod 0644 'apt/sources.list.d/salt.list'
 maybe chmod 0644 'apt/trusted.gpg'
 maybe chmod 0755 'apt/trusted.gpg.d'

diff --git a/apt/sources.list.d/icinga.list b/apt/sources.list.d/icinga.list
new file mode 100644 (file)
index 0000000..e4f5617
--- /dev/null
+++ b/apt/sources.list.d/icinga.list
@@ -0,0 +1,2 @@
+deb    http://packages.icinga.com/debian icinga-stretch main
+deb-src        http://packages.icinga.com/debian icinga-stretch main

diff --git a/apt/trusted.gpg b/apt/trusted.gpg
index af016abf026dd978fdc0a8fb668215478e585d2e..96e7a47ddfafdeaa9638b81dd720b19683049cb2 100644 (file)
Binary files a/apt/trusted.gpg and b/apt/trusted.gpg differ

diff --git a/icinga2/conf.d/apt.conf b/icinga2/conf.d/apt.conf
index b2c77a0c1f29514d985fcaa449d680dd030d4895..bdf2acc03093f618b02546d7c9e7bb7785927d07 100644 (file)
--- a/icinga2/conf.d/apt.conf
+++ b/icinga2/conf.d/apt.conf
@@ -2,6 +2,7 @@ apply Service "apt" {
   import "generic-service"
 
   check_command = "apt"
+  enable_notifications = false
 
   assign where host.name == NodeName
 }

diff --git a/icinga2/conf.d/services.conf b/icinga2/conf.d/services.conf
index e459407173d384a958f40856c030b093e679a247..0db2dc2f374c088a3926394771792c65f9d17f46 100644 (file)
--- a/icinga2/conf.d/services.conf
+++ b/icinga2/conf.d/services.conf
@@ -97,25 +97,25 @@ 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 "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 034ba629caaadd815a46a9fd4ca495ce9af62e09..5f78f742390163bd58b7c953de9ebf9cb70fc41d 100644 (file)
--- a/icinga2/conf.d/users.conf
+++ b/icinga2/conf.d/users.conf
@@ -27,11 +27,15 @@ object User "frank_by_gmx" {
   import "generic-user"
 
   display_name = "Frank Brehm by GMX"
-  groups = [ "icingaadmins" ]
+  groups = [ "emergency_admins" ]
 
   email = "frank.brehm@gmx.net"
 }
 
+object UserGroup "emergency_admins" {
+  display_name = "Admins Group for Eemergency"
+}
+
 object UserGroup "icingaadmins" {
   display_name = "Icinga 2 Admin Group"
 }