get rid of farm-ab and farm-89

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 1caac1f..b57ed07 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -1318,29 +1318,9 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-67"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-89
+    name: disk usage on /srv/farm-snapshot/farm-misc
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-89"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-ab
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-ab"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-cd
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-cd"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-f
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-f"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-e
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-e"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/farm-snapshot/farm-misc"
     hosts: sibelius
   -
     name: disk usage on /srv/fossology.debian.net
@@ -2227,11 +2207,11 @@ services:
     name: network service - https
     check: check_https
     hostgroups: apache-https
-#    excludehosts: handel
+    excludehosts: handel
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
-    name: network service - https with auth
+    name: network service - https
     check: dsa_check_https_want_auth
     hosts: handel
     depends: "process - apache2 - master"