soler: decomission rt#5890

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5aaf2fe..8b9e088 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -197,10 +197,6 @@ servers:
     address: 195.20.242.124
     parents: schumann
     hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres94-hosts, jessie
-  soler:
-    address: 195.20.242.126
-    parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, jessie, apache-https
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
@@ -386,6 +382,10 @@ servers:
     address: 5.153.231.11
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
+  backuphost:
+    address: 5.153.231.12
+    parents: ganeti-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, jessie
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
@@ -459,7 +459,7 @@ servers:
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   httpredir-bm-01:
     address: 5.153.231.35
     parents: ganeti-bytemark
@@ -865,10 +865,6 @@ servers:
     address: 86.59.118.151
     parents: gw-sil
     hostgroups: computers, porterbox, jessie, hassrvfs
-  eysler:
-    address: 86.59.118.152
-    parents: gw-sil
-    hostgroups: computers, buildd, jessie
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
@@ -929,10 +925,6 @@ servers:
     address: 206.12.19.118
     parents: ganeti2
     hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
-  brahms:
-    address: 206.12.19.115
-    parents: ganeti2
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
   geo2:
     address: 206.12.19.113
     parents: ganeti2
@@ -955,14 +947,6 @@ servers:
     parents: ganeti2
     hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
-  gabrielli:
-    address: 206.12.19.17
-    parents: sw-ubcece-kais
-    hostgroups: computers, porterbox, jessie
-  corelli:
-    address: 206.12.19.16
-    parents: sw-ubcece-kais
-    hostgroups: computers, buildd, jessie
   lucatelli:
     address: 206.12.19.15
     parents: sw-ubcece-kais
@@ -1619,7 +1603,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: storace
+    excludehosts: backuphost, storace, backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1627,7 +1611,7 @@ services:
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: storace
+    hosts: backuphost, storace, backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -2446,7 +2430,7 @@ services:
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
-    hosts: storace
+    hosts: storace, backuphost
   # }}}
   # {{{ power
 #  -