X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=54b06cf366c2d9ecc9d39c006e23042332439509;hb=8c31e0a7f2c80f677fa79d91bd2e6bdbf316964a;hp=53aaccbff9677719962364dddc79a3f286afec18;hpb=93342da2402cfd11b4984aeabf783f570a2385d6;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 53aaccb..54b06cf 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -113,10 +113,6 @@ servers:
     address: 140.211.166.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-rapidswitch:
-    address: 193.201.200.129
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-sakura:
     address: 133.242.99.65
     parents: gw-ubcece
@@ -179,11 +175,6 @@ servers:
     address: 213.165.95.6
     parents: powell
     hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
-  piu-slave-1und1-01:
-    address: 213.165.95.7
-    parents: powell
-    hostgroups: computers, service, kvmdomains, jessie
-    contacts: holger
   # }}}
   # {{{ gw-1und1-sec
   schumann:
@@ -206,10 +197,10 @@ servers:
     hostgroups: computers, buildd, hassrvfs, jessie
   # }}}
   # {{{ gw-aql
-  etler:
+  eller:
     address: 141.170.6.156
     parents: gw-aql
-    hostgroups: computers, porterbox, jessie, hassrvfs, hasbootfs, sw-raid
+    hostgroups: computers, porterbox, jessie, hassrvfs
   mips-aql-01:
     address: 141.170.6.149
     parents: gw-aql
@@ -289,7 +280,7 @@ servers:
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, dl380, hpnewraid, jessie
+    hostgroups: computers, service, dl380, hpnewraid, jessie, hassrvfs, postgres94-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -445,6 +436,10 @@ servers:
     address: 5.153.231.25
     parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https
+  olin:
+    address: 5.153.231.26
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, jessie
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
@@ -517,10 +512,6 @@ servers:
     contacts: faw
   # }}}
   # {{{ gw-cecsit
-  gluck:
-    address: 150.203.164.38
-    parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula, apache-https
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
@@ -539,14 +530,6 @@ servers:
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
-  sompek:
-    address: 217.196.149.225
-    parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
-  stadler:
-    address: 217.196.149.226
-    parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
   # }}}
   # {{{ gw-csail
   steffani:
@@ -595,6 +578,10 @@ servers:
     address: 128.31.0.67
     parents: ganeti-csail
     hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https
+  pkgmirror-csail:
+    address: 128.31.0.51
+    parents: ganeti-csail
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs
   # }}}
   # {{{ gw-dgi
   storace:
@@ -869,12 +856,6 @@ servers:
     parents: gw-osuosl
     hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid
   # }}}
-  # {{{ gs-rapidswitch
-  caballero:
-    address: 193.201.200.200
-    parents: gw-rapidswitch
-    hostgroups: computers, buildd, sw-raid, wheezy, hassrvfs, acpid-hosts
-  # }}}
   # {{{ gw-sanger
   sibelius:
     address: 193.62.202.28
@@ -1460,7 +1441,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: sibelius, busoni, buxtehude, lw07
+    hosts: sibelius, busoni, buxtehude, lw07, fasolo
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1510,7 +1491,7 @@ services:
     name: disk usage on /srv/ftp-master.debian.org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /srv/ftp-master.debian.org"
-    hosts: franck
+    hosts: franck, fasolo
   -
     name: disk usage on /storage/snapshot-farm-1
     servicegroups: diskspace