X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=630760446358d3c01c27685194d9705b52b4c69b;hb=0bdfaad3366c22fdf69d3695e9fc73e28a2278e6;hp=c07733ec2c8153110933db17c260725bbec9324a;hpb=f0e4828653b68e835efc4e3c0b006c55fe0f2e58;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index c07733e..6307604 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
@@ -336,10 +336,6 @@ servers:
     address: 62.104.23.252
     parents: gw-freenet
     hostgroups: computers, porterbox, sw-raid, lenny, puppet
-  bruckner:
-    address: 62.104.23.253
-    parents: gw-freenet
-    hostgroups: computers, no-udev, porterbox, single-cpu, no-samhain
 
   raptor:
     address: 195.243.109.162
@@ -454,7 +450,7 @@ servers:
   agnesi:
     address: 65.173.90.83
     parents: gw-agnesi
-    hostgroups: deadslow
+    hostgroups: deadslow, lenny
 
   spontini:
     address: 137.82.84.65
@@ -473,7 +469,7 @@ servers:
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts
+    hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts, puppet
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
@@ -953,7 +949,7 @@ services:
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3"
     depends: network service - sshd
     hostgroups: computers, deadslow
-    excludehosts: agnesi, crest, kullervo
+    excludehosts: crest, kullervo
     excludehostgroups: lenny
     normal_check_interval:  60
   -
@@ -967,10 +963,11 @@ services:
     check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
     depends: network service - sshd
     hostgroups: lenny
+    excludehosts: agnesi
     normal_check_interval:  60
   -
     name: "network service - sshd - version - 2260"
-    check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch3"
+    check: "dsa_check_ssh_port_version!2260!OpenSSH_5.1p1 Debian-5"
     depends: network service - sshd - 2260
     hosts: agnesi
     normal_check_interval:  60
@@ -1781,10 +1778,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"