villa on stretch

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0963b0a..7ed8143 100644 (file)
--- 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:
@@ -334,7 +334,7 @@ servers:
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, nfs-server, systemd-timesyncd
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
@@ -354,12 +354,12 @@ servers:
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
     contacts: holger
   piu-slave-bm-a:
     address: 5.153.231.7
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   binet:
     address: 5.153.231.8
@@ -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
@@ -388,11 +388,11 @@ servers:
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   rapoport:
     address: 5.153.231.15
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
@@ -400,7 +400,7 @@ servers:
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
   dinis:
     address: 5.153.231.19
     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
@@ -503,7 +503,7 @@ 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:
@@ -516,7 +516,7 @@ servers:
   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
@@ -636,7 +636,7 @@ servers:
   geo3:
     address: 194.177.211.201
     parents: gw-grnet
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, bind9-hosts, kvmdomains, stretch, systemd-timesyncd
   cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
@@ -645,18 +645,14 @@ servers:
     address: 194.177.211.203
     parents: ganeti-grnet
     hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
-  gigault:
-    address: 194.177.211.204
-    parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   vittoria:
     address: 194.177.211.205
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, postgres96-hosts, apache2-hosts, apache-https, systemd-timesyncd
   boott:
     address: 194.177.211.206
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   porta:
     address: 194.177.211.207
     parents: ganeti-grnet
@@ -670,7 +666,7 @@ servers:
   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, jessie, security_mirror
   mirror-isc2:
     address: 149.20.4.14
     parents: mirror-isc
@@ -761,7 +757,7 @@ servers:
   vento:
     address: 82.195.75.98
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, heavy-exim
   lully:
     address: 82.195.75.99
     parents: ganeti3
@@ -773,7 +769,7 @@ servers:
   geo1:
     address: 82.195.75.105
     parents: ganeti3
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+    hostgroups: computers, service, bind9-hosts, kvmdomains, stretch
   handel:
     address: 82.195.75.104
     parents: ganeti3
@@ -782,10 +778,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
@@ -854,7 +846,7 @@ servers:
   beach:
     address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https
 
   pieta:
     address: 140.211.166.195
@@ -881,7 +873,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
@@ -901,7 +893,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:
@@ -987,19 +979,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
@@ -1050,7 +1042,7 @@ servers:
   geo2:
     address: 209.87.16.31
     parents: ubc-gateway
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, bind9-hosts, kvmdomains, stretch, systemd-timesyncd
   lotti:
     address: 209.87.16.32
     parents: ubc-gateway
@@ -1078,20 +1070,24 @@ servers:
   ullmann:
     address: 209.87.16.38
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, postgres96-hosts, nfs-client, apache2-hosts, autofs, apache-https, systemd-timesyncd
   buxtehude:
     address: 209.87.16.39
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, heavy-exim, postgres96-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
   piu-slave-ubc-01:
     address: 209.87.16.42
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   hier:
     address: 209.87.16.43
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, 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:
@@ -1101,7 +1097,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, jessie, security_mirror
   mirror-umn2:
     address: 128.101.240.215
     parents: mirror-umn
@@ -1163,7 +1159,7 @@ servers:
   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
@@ -1233,9 +1229,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
@@ -1538,11 +1531,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4"
     hosts: sibelius
-  -
-    name: disk usage on /var/lib/postgresql/9.4
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.4"
-    hosts: vittoria
   -
     name: disk usage on /srv/ftp-master.debian.org
     servicegroups: diskspace
@@ -2134,13 +2122,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
@@ -2153,12 +2139,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
@@ -2380,16 +2360,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'"
@@ -2419,7 +2422,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