X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=eae5bb610bbd09cc58df0614ac6a0b2d3630e2a6;hb=ffba88a0228b0d4f3c607e86881e0c8ef38c1654;hp=820726836b849b4b384ec1519d306b255350084b;hpb=91b505b7e184480334773a00556242c76145ad4e;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 8207268..eae5bb6 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -338,7 +338,7 @@ servers:
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
@@ -520,11 +520,11 @@ servers:
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   mirror-anu3:
     address: 150.203.164.61
     parents: mirror-anu
-    hostgroups: secondary-IPs, security_mirror
+    hostgroups: secondary-IPs, security_mirror, rsyncd-hosts
   mirror-anu4:
     address: 150.203.164.62
     parents: mirror-anu
@@ -553,15 +553,15 @@ servers:
     parents: mirror-conova
   mirror-conova-security:
     address: 217.196.149.233
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts, security_mirror
     parents: mirror-conova
   mirror-conova-archive:
     address: 217.196.149.234
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
     parents: mirror-conova
   mirror-conova-syncproxy4-eu:
     address: 217.196.149.237
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
     parents: mirror-conova
 
   arm-conova-01:
@@ -690,11 +690,11 @@ servers:
   mirror-isc:
     address: 149.20.4.13
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch
   mirror-isc2:
     address: 149.20.4.14
     parents: mirror-isc
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts, security_mirror
   mirror-isc3:
     address: 149.20.4.15
     parents: mirror-isc
@@ -702,7 +702,7 @@ servers:
   mirror-isc-syncproxy:
     address: 149.20.4.16
     parents: mirror-isc
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   # }}}
   # {{{ gw-leaseweb
   lw01:
@@ -1125,15 +1125,15 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch
   mirror-umn2:
     address: 128.101.240.215
     parents: mirror-umn
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts, security_mirror
   mirror-umn3:
     address: 128.101.240.216
     parents: mirror-umn
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   mirror-umn4:
     address: 128.101.240.217
     parents: mirror-umn
@@ -2549,19 +2549,10 @@ services:
     name: network service - ftp
     check: check_ftp
     hostgroups: uploadqueue, security_mirror
-    excludehosts: klecker, mirror-isc, mirror-umn
   -
     name: network service - ftp
     check: check_ftp
     hosts: klecker-ftp
-  -
-    name: network service - ftp
-    check: check_ftp
-    hosts: mirror-umn2
-  -
-    name: network service - ftp
-    check: check_ftp
-    hosts: mirror-isc2
   # }}}
   # {{{ postgres
   -
@@ -3056,22 +3047,6 @@ services:
     name: network service - rsync
     check: check_tcp!873
     hostgroups: rsyncd-hosts
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: milanollo2
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: mirror-isc2, mirror-isc-syncproxy
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: mirror-umn2, mirror-umn3
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: mirror-anu2, mirror-anu3
   ###
   -
     name: process - icinga