donizetti on stretch

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index cdc97dd..375c3f9 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
@@ -453,7 +453,7 @@ servers:
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
@@ -586,14 +586,6 @@ servers:
     parents: gw-bytemark
     hostgroups: notacomputer
 
-  falla:
-    address: 128.31.0.65
-    parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie, jessie-freebsd
-  fischer:
-    address: 128.31.0.35
-    parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
@@ -860,10 +852,6 @@ servers:
     address: 140.211.166.197
     parents: pieta
     hostgroups: computers, hassrvfs, buildd, jessie
-  pizzetti:
-    address: 140.211.166.198
-    parents: pieta
-    hostgroups: computers, jessie, hassrvfs, porterbox
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
@@ -1006,7 +994,7 @@ servers:
   tye:
     address: 209.87.16.37
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ullmann:
     address: 209.87.16.38
     parents: ubc-gateway
@@ -1189,8 +1177,6 @@ hostgroups:
     alias: Hosts running wheezy
   jessie:
     alias: Hosts running jessie
-  jessie-freebsd:
-    alias: kFreebsd hosts running jessie
   stretch:
     alias: Hosts running stretch
 
@@ -1586,10 +1572,6 @@ services:
     hostgroups: computers
     excludehosts: zelenka, zandonai
     excludehostgroups: jessie, stretch
-  -
-    name: process - getty
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/getty"
-    hostgroups: jessie-freebsd
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
@@ -2544,17 +2526,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
@@ -2562,7 +2544,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
@@ -2570,7 +2552,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