retire rietz (re: RT#6110)

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 59c04b0..6dd8ba2 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -882,15 +882,6 @@ servers:
     address: 140.211.15.152
     parents: gw-osuosl
     hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid
-  rietz:
-    address: 140.211.166.43
-    parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, xinetd-hosts, jessie
-    #, bosserver
-  rietz2:
-    address: 140.211.166.44
-    parents: rietz
-    hostgroups: secondary-IPs
   # }}}
   # {{{ gs-rapidswitch
   caballero:
@@ -1457,17 +1448,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -X nfs4 --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount|/proc/sys/fs/binfmt_misc'"
     hostgroups: computers
-    excludehosts: sibelius, rietz
+    excludehosts: sibelius
   -
     name: disk usage - all
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x nfs4 -x /srv/farm-snapshot/farm-misc 95 98"
     hosts: sibelius
-  -
-    name: disk usage - all
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x nfs4 -x /srv -x /home 95 98"
-    hosts: rietz
 
   -
     name: disk usage on /
@@ -2087,7 +2073,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl180
-    excludehosts: schein, rietz
+    excludehosts: schein
     excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
@@ -2100,7 +2086,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
-    hosts: schein, rietz
+    hosts: schein
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2813,12 +2799,6 @@ services:
     check: check_tcp!873
     hostgroups: rsyncd-hosts
     depends: process - xinetd
-    excludehosts: rietz
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: rietz2
-    depends: rietz:process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873