put debussy into broken_https_default_vhost

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a382e82..2cf3a69 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -403,7 +403,7 @@ servers:
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
   moszumanska:
     address: 5.153.231.21
     parents: ganeti-bytemark
@@ -421,7 +421,7 @@ servers:
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
@@ -741,16 +741,6 @@ servers:
     address: 82.195.75.110
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload
-  fils:
-    address: 82.195.75.89
-    parents: ganeti3
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
-  fayrfax:
-    address: 82.195.75.82
-    parents: ganeti3
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
   vento:
     address: 82.195.75.98
     parents: ganeti3
@@ -1019,7 +1009,7 @@ servers:
   debussy:
     address: 209.87.16.46
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1958,12 +1948,6 @@ services:
     hostgroups: computers
     excludehostgroups: freebsd, alioth
     excludehosts: czerny, grnet-node01, storace
-  ###
-  -
-    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
   -
@@ -2471,14 +2455,14 @@ services:
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
-    hosts: fano, finzi, fils, fayrfax
+    hosts: fano, finzi
     contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    excludehosts: fano, finzi, fils, fayrfax
+    excludehosts: fano, finzi
     contact_groups: buildd
   -
     name: processes - zombie schroot
@@ -2526,17 +2510,17 @@ services:
   # {{{ mirroring
   -
     name: mirror sync - bugs
-    check: "dsa_check-mirrorsync_skew!bugs.debian.org!project/trace/bugs-master.debian.org!120:600"
+    check: "dsa_check_mirrorsync_skew!bugs.debian.org!project/trace/bugs-master.debian.org!120:600"
     hosts: global
     servicegroups: mirror
   -
     name: mirror sync - security
-    check: "dsa_check-mirrorsync_skew!security-nagios.debian.org!project/trace/security-master.debian.org!150:3600"
+    check: "dsa_check_mirrorsync_skew!security-nagios.debian.org!project/trace/security-master.debian.org!150:3600"
     hosts: global
     servicegroups: mirror
   -
     name: mirror sync - packages
-    check: "dsa_check-mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"
+    check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"
     hosts: global
     check_interval: 15
     max_check_attempts: 5
@@ -2544,7 +2528,7 @@ services:
     servicegroups: mirror
   -
     name: mirror sync - snapshot
-    check: "dsa_check-mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!3600:28800"
+    check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!3600:28800"
     hosts: global
     check_interval: 15
     max_check_attempts: 5
@@ -2552,7 +2536,7 @@ services:
     servicegroups: mirror
   -
     name: mirror sync - debian archive backend
-    check: "dsa_check-mirrorsync!debian.backend.mirrors.debian.org!debian/project/trace/master"
+    check: "dsa_check_mirrorsync!debian.backend.mirrors.debian.org!debian/project/trace/master"
     hosts: global
     check_interval: 15
     max_check_attempts: 5
@@ -2959,3 +2943,5 @@ services:
 # }}}
 
 # vim: set ts=2 sw=2 et ai si fdm=marker:
+
+