X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=e4fcf793e9e2c5f3f93fa70e54fe9cb55ac24b32;hb=cf2973bf115ddeb9adb42970d3f01d7d3377f4be;hp=ff76c208cef34532bef9d38ba7fc660bfb1d483f;hpb=56d0fd4f9686ae0b9437729e6f4055e407554c0c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ff76c20..e4fcf79 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -203,10 +203,6 @@ servers:
     address: 192.25.206.33
     parents: gw-HP-ftc
     hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, spamd, heavy-exim, bind9-hosts
-  spohr2:
-    address: 192.25.206.38
-    parents: gw-HP-ftc
-    hostgroups: secondary-IPs
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -307,7 +303,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue
 
   mayer:
     address: 140.211.166.78
@@ -409,7 +405,7 @@ servers:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers, hassrvfs
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
@@ -505,11 +501,11 @@ servers:
     contacts: lfilipoz
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu
   ravel:
     address: 206.12.19.5
     parents: tchaikovsky
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim
   dijkstra:
     address: 206.12.19.218
     parents: tchaikovsky
@@ -1040,6 +1036,7 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
+    excludehostgroups: squeeze
     normal_check_interval:  60
     retry_check_interval: 15
  ####
@@ -1694,7 +1691,7 @@ services:
     name: process - nagios3
     # there is always one extra process per check currently running..
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C nagios3 -a '/usr/sbin/nagios3 -d /etc/nagios3/nagios.cfg'"
-    hosts: spohr
+    hosts: tchaikovsky
 
  ###
   -
@@ -1730,7 +1727,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz
+    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1739,26 +1736,14 @@ services:
     # ries		ftp-master.debian.org
     # chopin		security-master.debian.org
     # spohr		rt.debian.org
-    # spohr2		nagios.debian.org
+    # tchaikovsky	nagios.debian.org
     # draghi		db.debian.org
     # merkel2		nm.debian.org
     # liszt		lists.debian.org
-    hosts: ries, chopin, spohr, spohr2, draghi, merkel2, liszt, widor, rietz
+    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz
     depends: network service - https
     normal_check_interval: 60
 
-  # spohr
-  -
-    name: network service - https
-    check: check_https
-    hosts: spohr2
-    depends: "spohr:process - apache2 - master"
-    normal_check_interval: 120
-  -
-    name: network service - http
-    check: check_http
-    hosts: spohr2
-    depends: "spohr:process - apache2 - master"
   # merkel
   -
     name: network service - https