X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=dbc7b0758ad9ff68d89b9f74b95b1f2f707f5630;hb=ffe0cc4daef3d0626c9abb0414fd61d784649fb3;hp=f7015b583bfde71a0728f059bc9d80c723c444d3;hpb=16f37111c1ae423854bf11a2b22248ca2845f5b8;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f7015b5..dbc7b07 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -271,7 +271,7 @@ servers:
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, apache-https, dl380, hpnewraid, rsyncd-systemd-hosts, jessie, hassrvfs, postgres94-hosts
+    hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-systemd-hosts, jessie, hassrvfs, postgres94-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -368,7 +368,7 @@ servers:
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, postgres94-hosts, postgres96-hosts, systemd-timesyncd
   ganeti-bytemark:
     address: 82.195.75.111
     parents: gw-bytemark
@@ -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
@@ -442,7 +442,7 @@ servers:
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
@@ -503,20 +503,20 @@ servers:
   casulana:
     address: 5.153.231.41
     parents: gw-bytemark
-    hostgroups: computers, service, stretch, hpnewraid, hassrvfs, dl380
+    hostgroups: computers, service, stretch, hassrvfs, dl380
   # }}}
   # {{{ gw-c3sl
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, hassrvfs, stretch, high-RTT, security_mirror, no-bacula, apache-https
     contacts: faw
   # }}}
   # {{{ gw-cecsit
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, stretch, apache-https
+    hostgroups: computers, service, apache2-hosts, dl360, hassrvfs, stretch, apache-https
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
@@ -539,10 +539,14 @@ 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
-    hostgroups: computers, stretch, service, apache2-hosts
+    hostgroups: computers, stretch, service, apache2-hosts, apache-https
   mirror-conova-debian:
     address: 217.196.149.232
     hostgroups: secondary-IPs
@@ -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:
@@ -660,13 +680,17 @@ servers:
   melartin:
     address: 194.177.211.208
     parents: ganeti-grnet
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd, postgres96-hosts
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, postgres96-hosts
+  static-master-grnet-01:
+    address: 194.177.211.209
+    parents: ganeti-grnet
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   # }}}
   # {{{ gw-isc
   mirror-isc:
     address: 149.20.4.13
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch, security_mirror
   mirror-isc2:
     address: 149.20.4.14
     parents: mirror-isc
@@ -778,10 +802,6 @@ servers:
     address: 82.195.75.107
     parents: ganeti3
     hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, stretch, apache-https
-  stockhausen:
-    address: 82.195.75.108
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie
   ganeti3:
     address: 82.195.75.111
     parents: gw-manda
@@ -877,7 +897,7 @@ servers:
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, stretch, dl380, hpnewraid, nfs-client, autofs
+    hostgroups: computers, service, stretch, dl380, nfs-client, autofs
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -897,7 +917,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:
@@ -983,19 +1003,19 @@ servers:
   ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
   ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
   ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
 
   rachmaninoff:
     address: 209.87.16.20
@@ -1066,7 +1086,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
@@ -1087,7 +1107,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, postgres96-hosts
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1097,7 +1121,7 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, 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
@@ -1151,27 +1175,15 @@ servers:
   henze:
     address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
   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
-  #antheil:
-  #  address: 217.140.96.60
-  #  parents: gw-arm
-  #  hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
-  #hasse:
-  #  address: 217.140.96.68
-  #  parents: gw-arm
-  #  hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
-  #henze:
-  #  address: 217.140.96.70
-  #  parents: gw-arm
-  #  hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
   # }}}
   # {{{ gw-zivit
   zandonai:
@@ -1187,7 +1199,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 #############################
@@ -1229,9 +1241,6 @@ hostgroups:
   general:
     alias: general purpose developer accessible machines
 
-  hpnewraid:
-    alias: new (2015+) machines where we need hpssacli instead of hpacucli
-    private: 1
   dl380:
     alias: HP DL380 hosts
     private: 1
@@ -2125,13 +2134,11 @@ services:
     excludehostgroups: sw-raid
   ###
   -
-    name: HW - hpacucli status
+    name: HW - HP raid status
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
+    nrpe: "if [ -e /var/cache/dsa/nagios/dsa-check-hpssacli ] ; then /usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/dsa-check-hpssacli ; else /usr/lib/nagios/plugins/dsa-check-hpacucli; fi"
     check_interval: 120
     hostgroups: dl380, dl360, bl460, bl460g8, dl180
-    excludehosts: busoni
-    excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -2144,12 +2151,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
     hosts: busoni
-  -
-    name: HW - hpssacli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpssacli"
-    check_interval: 120
-    hostgroups: hpnewraid
   ###
 #  -
 #    name: HW - edac status
@@ -2371,16 +2372,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'"
@@ -2410,7 +2434,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
@@ -2646,6 +2670,14 @@ services:
     max_check_attempts: 5
     retry_interval: 5
     servicegroups: mirror
+  -
+    name: mirror sync - debian archive backend
+    check: "dsa_check_mirrorsync!debian.backend.mirrors.debian.org!debian/project/trace/master"
+    hosts: global
+    check_interval: 15
+    max_check_attempts: 5
+    retry_interval: 5
+    servicegroups: mirror
 
   -
     name: mirror static sync - bits