X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=fcce85bfea651bc37c28441cbc717f12bcf74a41;hb=4cefce15a316ef00fa03aa87442f49425c2be1f7;hp=66d5dd1977a1d14661b1525041a0ec4734cacce2;hpb=feea0c70ebabfb30538b167df44ac00e79a8fc78;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 66d5dd1..fcce85b 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
@@ -496,7 +492,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: tchaikovsky
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, ulogd-hosts
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts
   dijkstra:
     address: 206.12.19.218
     parents: tchaikovsky
@@ -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
@@ -607,10 +603,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 +972,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