X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=6ec0254145214cf76a609636fdf14042e8bfd8de;hb=f87ae1aed96a7f22880a3673f739d2082f4777f5;hp=0bcc372af17359033f1f57f79d53f32891ae9b30;hpb=4eccc9e0beb5958112228fc3a654f723575554fd;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0bcc372..6ec0254 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -316,6 +316,10 @@ servers:
     address: 140.211.166.44
     parents: rietz
     hostgroups: secondary-IPs
+  busoni:
+    address: 140.211.15.34
+    parents: gw-osuosl
+    hostgroups: computers, service, lenny, dl360, hassrvfs, acpid-hosts, apache2-hosts
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
@@ -394,6 +398,11 @@ servers:
     # SMP kernel doesn't run stable
     hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny
     contacts: tjrc1
+  sibelius:
+    address: 193.62.202.28
+    parents: gw-sanger
+    hostgroups: computers, lenny, acpid-hosts
+    contacts: tjrc1
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
@@ -486,31 +495,31 @@ servers:
     parents: gw-ubcnew
     hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue
   dijkstra:
-    address: 137.82.84.70
-    parents: gw-ubc
+    address: 206.12.19.218
+    parents: gw-ubcnew
     hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts
   luchesi:
     address: 206.12.19.214
     parents: gw-ubcnew
     hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts
   wolkenstein:
-    address: 137.82.84.89
+    address: 206.12.19.116
     parents: dijkstra
     hostgroups: computers, lenny, hasbootfs, hassrvfs
   brahms:
-    address: 137.82.84.74
+    address: 206.12.19.115
     parents: dijkstra
     hostgroups: computers, lenny, buildd, hasbootfs, hassrvfs
   geo2:
-    address: 137.82.84.71
+    address: 206.12.19.113
     parents: dijkstra
     hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
   duarte:
-    address: 137.82.84.77
+    address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, hassrvfs
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, single-cpu, apache2-hosts
   valente:
-    address: 137.82.84.76
+    address: 206.12.19.112
     parents: dijkstra
     hostgroups: computers, lenny, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts
   bellini:
@@ -518,8 +527,8 @@ servers:
     parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim
   morricone:
-    address: 137.82.84.81
-    parents: gw-ubc
+    address: 206.12.19.9
+    parents: gw-ubcnew
     hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts
   stabile:
     address: 137.82.84.72
@@ -530,16 +539,16 @@ servers:
     parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client
   paganini:
-    address: 137.82.84.82
-    parents: gw-ubc
+    address: 206.12.19.10
+    parents: gw-ubcnew
     hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
   respighi:
     address: 137.82.84.83
     parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
   vivaldi:
-    address: 137.82.84.84
-    parents: gw-ubc
+    address: 206.12.19.12
+    parents: gw-ubcnew
     hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
   # MSA 2000 (2012i)
   giustini:
@@ -1217,7 +1226,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: liszt
+    excludehosts: liszt, rietz
 
  ###
   #-
@@ -1620,20 +1629,20 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, klecker, draghi, liszt, spohr, widor, rietz
+    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
     # ries		ftp-master.debian.org
-    # klecker		security-master.debian.org
+    # chopin		security-master.debian.org
     # spohr		rt.debian.org
     # spohr2		nagios.debian.org
     # draghi		db.debian.org
     # merkel2		nm.debian.org
     # liszt		lists.debian.org
-    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt, widor, rietz
+    hosts: ries, chopin, spohr, spohr2, draghi, merkel2, liszt, widor, rietz
     depends: network service - https
     normal_check_interval: 60