... except mirror-accumu which still get it through xinetd

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4f7fbc2..41d2ef4 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -28,6 +28,10 @@ servers:
     address: 130.239.18.97
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-accumu2:
+    address: 130.242.6.198
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-aql:
     address: 141.170.2.17
     parents: gw-ubcece
@@ -166,7 +170,7 @@ servers:
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, jessie, security_mirror, hasvarlogfs, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, xinetd-hosts, jessie, security_mirror, hasvarlogfs, no-bacula
   # }}}
   # {{{ gw-accumu
   pettersson:
@@ -178,9 +182,9 @@ servers:
     parents: gw-accumu
     hostgroups: computers, buildd, hassrvfs, jessie
   mirror-accumu:
-    address: 130.239.18.124
-    parents: gw-accumu
-    hostgroups: computers, service, jessie, apache2-hosts, hassrvfs
+    address: 130.242.6.199
+    parents: gw-accumu2
+    hostgroups: computers, service, jessie, apache2-hosts, hassrvfs, rsyncd-hosts, xinetd-hosts
   # }}}
   # {{{ gw-aql
   eller:
@@ -236,7 +240,7 @@ servers:
   arm-arm-01:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
   arm-arm-03:
     address: 217.140.96.60
     parents: gw-arm
@@ -262,7 +266,7 @@ servers:
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-systemd-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
@@ -508,7 +512,7 @@ servers:
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, xinetd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
     contacts: faw
   # }}}
   # {{{ gw-cecsit
@@ -554,7 +558,7 @@ servers:
   arm-conova-01:
     address: 217.196.149.230
     parents: aagaard
-    hostgroups: computers, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, stretch
   # }}}
   # {{{ gw-csail
   csail-node01:
@@ -581,7 +585,7 @@ servers:
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-systemd-hosts, xinetd-hosts, apache-https, systemd-timesyncd
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
@@ -589,7 +593,7 @@ servers:
   x86-csail-02:
     address: 128.31.0.68
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   httpredir-csail-01:
     address: 128.31.0.66
     parents: ganeti-csail
@@ -617,7 +621,7 @@ servers:
   sechter:
     address: 128.61.240.73
     parents: gw-gatech
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, sw-raid, hasbootfs, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-grnet
   ganeti-grnet:
@@ -691,19 +695,19 @@ servers:
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts, xinetd-hosts
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts, xinetd-hosts
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts, xinetd-hosts
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts, xinetd-hosts
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
@@ -796,7 +800,7 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-systemd-hosts, xinetd-hosts
   mailly:
     address: 82.195.75.114
     parents: ganeti3
@@ -838,7 +842,7 @@ servers:
   zani:
     address: 148.100.88.22
     parents: gw-marist
-    hostgroups: computers, buildd, hassrvfs, jessie, incomingmailrelayed
+    hostgroups: computers, buildd, hassrvfs, stretch, incomingmailrelayed
   # }}}
   # {{{ gw-osuosl
   busoni:
@@ -853,7 +857,7 @@ servers:
   beach:
     address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, rsyncd-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https
 
   pieta:
     address: 140.211.166.195
@@ -862,7 +866,7 @@ servers:
   ppc64el-osuosl-01:
     address: 140.211.166.196
     parents: pieta
-    hostgroups: computers, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, stretch
   powerpc-osuosl-01:
     address: 140.211.166.197
     parents: pieta
@@ -896,11 +900,11 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-sil
   eberlin:
@@ -910,11 +914,11 @@ servers:
   mips-sil-01:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, buildd, jessie, hassrvfs
+    hostgroups: computers, buildd, stretch, hassrvfs
   mipsel-sil-01:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, buildd, jessie, hassrvfs
+    hostgroups: computers, buildd, stretch, hassrvfs
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -1001,7 +1005,7 @@ servers:
   x86-ubc-01:
     address: 209.87.16.21
     parents: ubc-gateway
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   finzi:
     address: 209.87.16.22
     parents: ubc-gateway
@@ -1086,7 +1090,7 @@ servers:
   #saens:
   #  address: 128.101.240.212
   #  parents: gw-umn
-  #  hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+  #  hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
@@ -1126,7 +1130,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
+    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-systemd-hosts, dl380, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1184,7 +1188,7 @@ servers:
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror
+    hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-systemd-hosts, xinetd-hosts, security_mirror
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -2038,6 +2042,7 @@ services:
     name: process - rngd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd -a '/usr/sbin/rngd -r /dev/hwrng'"
     hostgroups: kvmdomains
+    excludehostgroups: stretch
   # }}}
   # {{{ anti-services
   -
@@ -3072,7 +3077,7 @@ services:
   ###
   -
     name: process - icinga
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:60 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:90 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
     hosts: tchaikovsky
   ###
   -