X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f2123fe1574f718dcecd7cbb629983329930a24d;hb=fd1fd0ba2d41d2b66fe636f15f8bbe1578f93ff2;hp=203995af7a03b36b4eda6b16418cbb1504944672;hpb=31a25ca9c7f2a29e43c486c9c0c6344cac84b17d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 203995a..f2123fe 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -178,7 +178,7 @@ servers:
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, jessie, security_mirror, hasvarlogfs, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula
   # }}}
   # {{{ gw-accumu
   pettersson:
@@ -222,7 +222,7 @@ servers:
   minkus:
     address: 141.170.6.151
     parents: gw-aql
-    hostgroups: computers, porterbox, jessie, nfs-client
+    hostgroups: computers, porterbox, stretch, nfs-client
   mipsel-aql-01:
     address: 141.170.6.152
     parents: gw-aql
@@ -240,7 +240,7 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, jessie, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, stretch, broken_mq
   arnold:
     address: 217.140.96.57
     parents: gw-arm
@@ -256,11 +256,11 @@ servers:
   arm-arm-04:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, jessie, armhf, porterbox, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, stretch, armhf, porterbox, broken_mq
   hartmann:
     address: 217.140.96.67
     parents: gw-arm
@@ -353,11 +353,11 @@ servers:
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, nfs-server, systemd-timesyncd
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
@@ -411,7 +411,7 @@ servers:
   dinis:
     address: 5.153.231.19
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
@@ -615,7 +615,7 @@ servers:
   storace:
     address: 93.94.130.161
     parents: gw-dgi
-    hostgroups: computers, jessie, dl380, nfs-client, hassrvfs
+    hostgroups: computers, stretch, dl380, nfs-client, hassrvfs
   # }}}
   # {{{ gw-gatech
   sechter:
@@ -788,7 +788,7 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, jessie, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, stretch, apache-https
   stockhausen:
     address: 82.195.75.108
     parents: ganeti3
@@ -808,7 +808,7 @@ servers:
   denis:
     address: 82.195.75.91
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie, bind9-hosts
+    hostgroups: computers, service, kvmdomains, stretch, bind9-hosts
   vogler:
     address: 82.195.75.92
     parents: ganeti3
@@ -888,7 +888,7 @@ servers:
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, jessie, dl380, hpnewraid, nfs-client, autofs
+    hostgroups: computers, service, stretch, dl380, hpnewraid, nfs-client, autofs
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -1041,7 +1041,7 @@ servers:
   reger:
     address: 209.87.16.27
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, heavy-exim, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, heavy-exim, systemd-timesyncd
   diabelli:
     address: 209.87.16.28
     parents: ubc-gateway
@@ -1073,7 +1073,7 @@ servers:
   tchaikovsky:
     address: 209.87.16.35
     parents: ubc-gateway
-    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie, systemd-timesyncd
+    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, stretch, systemd-timesyncd
   gretchaninov:
     address: 209.87.16.36
     parents: ubc-gateway
@@ -1174,7 +1174,7 @@ servers:
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, jessie
+    hostgroups: computers, sw-raid, jessie, no-bacula
   #antheil:
   #  address: 217.140.96.60
   #  parents: gw-arm
@@ -1196,7 +1196,7 @@ servers:
   zelenka:
     address: 80.245.147.40
     parents: gw-zivit
-    hostgroups: computers, porterbox, hassrvfs, jessie
+    hostgroups: computers, porterbox, hassrvfs, stretch
   # }}}
   # {{{ gw-sakura
   setoguchi:
@@ -1725,7 +1725,7 @@ services:
   -
     name: process - bacula-dir
     servicegroups: backup
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-dir -a '/usr/sbin/bacula-dir -c /etc/bacula/bacula-dir.conf'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-dir -a '/usr/sbin/bacula-dir -f -c /etc/bacula/bacula-dir.conf'"
     hosts: dinis
   -
     name: process - bacula-fd