X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=14eef83939ef44f008f9be3949eb517831ff39af;hb=db9281651433701230a336bacb3c7e54cb5bf2da;hp=7c76a52176a0575d72c922a97854f39f9ed7dc3f;hpb=e7e61b7b24f8da8db8dd220690d7eca604eb604d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 7c76a52..14eef83 100644
--- 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, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
   kaufmann:
     address: 82.195.75.107
     parents: unger
@@ -1298,49 +1298,9 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: stabile,sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-01
+    name: disk usage on /srv/farm-snapshot/farm-misc
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-01"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-23
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-23"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-45
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-45"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-67
-    servicegroups: diskspace
-    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
-    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
@@ -2231,7 +2191,7 @@ services:
     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"
@@ -2506,10 +2466,6 @@ services:
     name: mirror sync - security
     check: "dsa_check_mirrorsync_skew!security-nagios.debian.org!project/trace/security-master.debian.org!150:3600"
     hosts: global
-  -
-    name: mirror sync - volatile
-    check: "dsa_check_mirrorsync_skew!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org!150:3600"
-    hosts: global
   -
     name: mirror sync - packages
     check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"