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 f8ccc87..b57ed07 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -523,7 +523,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https
   kaufmann:
     address: 82.195.75.107
     parents: unger
@@ -564,7 +564,7 @@ servers:
   piston:
     address: 140.211.15.154
     parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze
+    hostgroups: computers, hassrvfs, squeeze, hassrvfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -679,10 +679,18 @@ servers:
     address: 206.12.19.218
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  pasquini:
+    address: 206.12.19.217
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
   luchesi:
     address: 206.12.19.214
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  tristano:
+    address: 206.12.19.213
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
   tchaikovsky:
     address: 206.12.19.118
     parents: luchesi
@@ -1310,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
-    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
+    name: disk usage on /srv/farm-snapshot/farm-misc
     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
@@ -2219,6 +2207,13 @@ services:
     name: network service - https
     check: check_https
     hostgroups: apache-https
+    excludehosts: handel
+    depends: "process - apache2 - master"
+    normal_check_interval: 120
+  -
+    name: network service - https
+    check: dsa_check_https_want_auth
+    hosts: handel
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -