X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=6e50b23580533cba7dd803afbfeee823a5c92eb7;hb=1fcbd1b85a832edf0964f227dfd5fcc4dbacfebd;hp=f76d1380cb3604762cb6f5e6f486ecaf55c29ada;hpb=04b7596a255c2be82be6b64ef0e9f1d7ed162cca;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f76d138..6e50b23 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -307,10 +307,6 @@ servers:
     address: 140.211.166.58
     parents: gw-osuosl
     hostgroups: computers, buildd, hasbootfs, ulogd-hosts
-  malo:
-    address: 140.211.166.27
-    parents: gw-osuosl
-    hostgroups: computers, buildd, smart
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -507,7 +503,7 @@ servers:
     hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu, ulogd-hosts
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
@@ -547,7 +543,7 @@ servers:
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
@@ -572,6 +568,14 @@ servers:
     address: 206.12.19.111
     parents: luchesi
     hostgroups: computers, freebsd, squeeze
+  gabrielli:
+    address: 206.12.19.17
+    parents: tchaikovsky
+    hostgroups: computers, single-cpu 
+  corelli:
+    address: 206.12.19.16
+    parents: tchaikovsky
+    hostgroups: computers, single-cpu, buildd, ulogd-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -580,7 +584,7 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs, hasorgfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs
 
   tartini:
     address: 82.94.249.158
@@ -607,10 +611,6 @@ servers:
     parents: gw-HP-ftc
     hostgroups: computers, buildd, hassrvfs, ulogd-hosts
 
-  escher:
-    address: 213.188.99.215
-    parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, hasvarfs, hashomefs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
@@ -980,7 +980,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: saens, puccini, merkel, tartini, powell, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace