X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=6d1ef02b10e5ca71a45240df21aedc016a29dbed;hb=4da676dfd2a2955277eac2ea52bdf150908b862a;hp=1ab6c8deee748960aea85a71666ebccd8a45761c;hpb=ec7452ba45cc30d7485c0c707b7931a528112319;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 1ab6c8d..6d1ef02 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -64,7 +64,7 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-dg-i.net:
-    address: 195.49.152.190
+    address: 93.94.130.190
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: bzed
@@ -180,7 +180,7 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, apache2-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
+    hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
   spohr:
     address: 192.25.206.33
     parents: samosa
@@ -221,7 +221,7 @@ servers:
   sperger:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny, puppet
     contacts: bzed
   agricola:
     address: 82.195.75.86
@@ -274,11 +274,11 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, no-udev, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, lenny, puppet
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, no-udev, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, lenny, puppet
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
@@ -394,6 +394,10 @@ servers:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny, puppet
+  chopin:
+    address: 195.20.242.124
+    parents: schumann
+    hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts
 
   caballero:
     address: 193.201.200.200
@@ -469,7 +473,7 @@ servers:
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts, puppet
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
@@ -745,12 +749,12 @@ services:
     name: disk usage on /var
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, tartini, morales, powell, escher
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, tartini, morales, powell, escher
   -
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -760,7 +764,7 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka, chopin
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -780,7 +784,7 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, voltaire, lebrun, rem, ball, paer, escher
+    hosts: raptor, voltaire, rem, ball, paer, escher
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -1777,10 +1781,6 @@ services:
     name: mirror sync - security.us
     check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
     hosts: global
-  -
-    name: DNS SOA sync - debprivate-ftcollins.debian.org
-    check: "dsa_check_soas!debprivate-ftcollins.debian.org"
-    hosts: global
   -
     name: DNS SOA sync - debian.org
     check: "dsa_check_soas_add!samosa.debian.org!debian.org"