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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c3cc722..fcce85b 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -181,7 +181,7 @@ servers:
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts, ulogd-hosts
   merkel:
     address: 192.25.206.16
     parents: gw-HP-ftc
@@ -197,7 +197,7 @@ servers:
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, sw-raid, hasbootfs, single-cpu
+    hostgroups: computers, buildd, sw-raid, hasbootfs, single-cpu, ulogd-hosts
     contacts: dannf
   penalosa:
     address: 192.25.206.68
@@ -239,7 +239,7 @@ servers:
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs, ulogd-hosts
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -258,7 +258,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, kvmdomains, ulogd-hosts
   geo1:
     address: 82.195.75.105
     parents: unger
@@ -282,7 +282,7 @@ servers:
   purcell:
     address: 82.195.75.69
     parents: gw-man-da
-    hostgroups: computers, buildd, single-cpu
+    hostgroups: computers, buildd, single-cpu, ulogd-hosts
 
   master:
     address: 70.103.162.29
@@ -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
@@ -331,15 +327,15 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, ulogd-hosts
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, ulogd-hosts
   gluck:
     address: 150.203.164.38
     parents: gw-anu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts, ulogd-hosts
 
   steffani:
     address: 128.31.0.36
@@ -370,7 +366,7 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, ulogd-hosts
 
   argento:
     address: 93.94.130.160
@@ -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
@@ -515,7 +511,7 @@ servers:
   brahms:
     address: 206.12.19.115
     parents: dijkstra
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, ulogd-hosts
   geo2:
     address: 206.12.19.113
     parents: dijkstra
@@ -576,7 +572,7 @@ servers:
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs
+    hostgroups: computers, buildd, sw-raid, hasorgfs, ulogd-hosts
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
@@ -607,14 +603,10 @@ 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
-    hostgroups: computers, single-cpu, hasbootfs, ntpsuckers
+    hostgroups: computers, single-cpu, hasbootfs, ntpsuckers, ulogd-hosts
 
   schein:
     address: 149.20.20.6
@@ -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