X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=2e6b5393073369e91c90a48066cddbba2757d2c8;hb=efa7c15b14ae0f61eded811bb0016673a0683482;hp=8e01ac449275ee665c18b012ad7572d68adc0ea3;hpb=ad6810677b2d04de2dbcfebdc7c0493ce34dd04b;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 8e01ac4..2e6b539 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -93,10 +93,6 @@ servers:
     address: 185.17.185.190
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-linaro:
-    address: 64.28.108.36
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-manda:
     address: 82.195.78.118
     parents: gw-ubcece
@@ -729,20 +725,6 @@ servers:
     parents: gw-leaseweb
     hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
   # }}}
-  # {{{ gw-linaro
-  arm-linaro-01:
-    address: 64.28.108.83
-    parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, stretch, broken_mq
-  arm-linaro-03:
-    address: 64.28.108.85
-    parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, stretch, broken_mq
-  asachi:
-    address: 64.28.108.84
-    parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, stretch, broken_mq
-  # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
     address: 129.143.160.6
@@ -820,7 +802,7 @@ servers:
   vogler:
     address: 82.195.75.92
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie
+    hostgroups: computers, service, kvmdomains, stretch
   wolkenstein:
     address: 82.195.75.65
     parents: ganeti3
@@ -1114,7 +1096,7 @@ servers:
   debussy:
     address: 209.87.16.46
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1529,24 +1511,44 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-1
+    name: disk usage on /srv/farm-snapshot/farm-2017-0
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-0"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-1
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-1"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-2
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-2"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-3
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-3"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-4
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-1"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-4"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-2
+    name: disk usage on /srv/farm-snapshot/farm-2017-5
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-5"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-3
+    name: disk usage on /srv/farm-snapshot/farm-2017-6
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-3"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-6"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-4
+    name: disk usage on /srv/farm-snapshot/farm-2017-7
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-7"
     hosts: sibelius
   -
     name: disk usage on /srv/ftp-master.debian.org