X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f83c265cabfc73990e89c3521f9a92c60ee73dfd;hb=cb179418bf99382575402277fbb0d2b6b4307cb3;hp=1c4a732239ae9bf8261bf2f1081524ec7c6d6423;hpb=43ed4ba64672ed190042889ba99ae2a81fe51373;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 1c4a732..f83c265 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -380,7 +380,7 @@ servers:
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
@@ -430,7 +430,7 @@ servers:
   olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
@@ -539,6 +539,10 @@ servers:
     address: 217.196.149.228
     parents: gw-conova
     hostgroups: computers, stretch, service, sw-raid
+  ganeti-conova:
+    address: 217.196.149.235
+    parents: gw-conova
+    hostgroups: notacomputer
   mirror-conova:
     address: 217.196.149.229
     parents: gw-conova
@@ -551,11 +555,27 @@ servers:
     address: 217.196.149.233
     hostgroups: secondary-IPs
     parents: mirror-conova
+  mirror-conova-archive:
+    address: 217.196.149.234
+    hostgroups: secondary-IPs
+    parents: mirror-conova
+  mirror-conova-syncproxy4-eu:
+    address: 217.196.149.237
+    hostgroups: secondary-IPs
+    parents: mirror-conova
 
   arm-conova-01:
     address: 217.196.149.230
-    parents: aagaard
+    parents: ganeti-conova
     hostgroups: computers, hassrvfs, buildd, stretch
+  arm-conova-02:
+    address: 217.196.149.231
+    parents: ganeti-conova
+    hostgroups: computers, hassrvfs, buildd, stretch
+  amdahl:
+    address: 217.196.149.236
+    parents: ganeti-conova
+    hostgroups: computers, hassrvfs, porterbox, stretch
   # }}}
   # {{{ gw-csail
   csail-node01:
@@ -582,7 +602,7 @@ servers:
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-systemd-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, apache2-hosts, rsyncd-systemd-hosts, apache-https, systemd-timesyncd
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
@@ -602,7 +622,7 @@ servers:
   usper:
     address: 128.31.0.69
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, queued, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, uploadqueue, queued, systemd-timesyncd
   # }}}
   # {{{ gw-dgi
   storace:
@@ -614,7 +634,7 @@ servers:
   sechter:
     address: 128.61.240.73
     parents: gw-gatech
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, sw-raid, hasbootfs, hassrvfs, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, sw-raid, hasbootfs, hassrvfs, stretch, security_mirror
   # }}}
   # {{{ gw-grnet
   ganeti-grnet:
@@ -893,7 +913,7 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl360, hassrvfs, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl360, hassrvfs, stretch, security_mirror
   # }}}
   # {{{ gw-sil
   eberlin:
@@ -1062,7 +1082,7 @@ servers:
   gretchaninov:
     address: 209.87.16.36
     parents: ubc-gateway
-    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts, apache-https, systemd-timesyncd
   tye:
     address: 209.87.16.37
     parents: ubc-gateway
@@ -1083,11 +1103,11 @@ servers:
   hier:
     address: 209.87.16.43
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   godard:
     address: 209.87.16.44
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts, postgres96-hosts
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1097,7 +1117,7 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch, security_mirror
   mirror-umn2:
     address: 128.101.240.215
     parents: mirror-umn
@@ -1155,11 +1175,11 @@ servers:
   hasse:
     address: 144.32.168.75
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
   antheil:
     address: 144.32.168.76
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
   #antheil:
   #  address: 217.140.96.60
   #  parents: gw-arm
@@ -1187,7 +1207,7 @@ servers:
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-systemd-hosts, security_mirror
+    hostgroups: computers, service, stretch, no-bacula, hassrvfs, apache2-hosts, rsyncd-systemd-hosts, security_mirror
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -2360,16 +2380,39 @@ services:
     name: process - postfix - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C master -a '/usr/lib/postfix/master'"
     hostgroups: postfix-hosts
+    excludehostgroups: stretch
+  -
+    name: process - postfix - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C master -a '/usr/lib/postfix/sbin/master'"
+    hostgroups: postfix-hosts
+    excludehostgroups: jessie
+
   -
     name: process - postfix - qmgr
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C qmgr -a 'qmgr -l -t fifo -u'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
+    excludehostgroups: stretch
+  -
+    name: process - postfix - qmgr
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C qmgr -a 'qmgr -l -t unix -u'"
+    hostgroups: postfix-hosts
+    depends: process - postfix - master
+    excludehostgroups: jessie
+
   -
     name: process - postfix - pickup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C pickup -a 'pickup -l -t fifo -u -c'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
+    excludehostgroups: stretch
+  -
+    name: process - postfix - pickup
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C pickup -a 'pickup -l -t unix -u -c'"
+    hostgroups: postfix-hosts
+    depends: process - postfix - master
+    excludehostgroups: jessie
+
   -
     name: process - postfix - anvil
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:1 -c 0: -u postfix -C anvil -a 'anvil -l -t unix -u'"
@@ -2399,7 +2442,7 @@ services:
 
   -
     name: network service local - smtps cert
-    nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
+    nrpe: "/usr/lib/nagios/plugins/check_smtp -H localhost -S -D 14"
     hostgroups: postfix-hosts
     depends: process - postfix - master
     check_interval: 120