X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=4b504c8c49c71023f7e332681916f36f36351d2d;hb=9ca90c66a0175f8c35bc3f51f2a8b3791b9e5492;hp=d6d32894274fa999f1c945b3c3657ff2d8567629;hpb=4bd32641e07667b6e51d528ee1d21a0b0d7fdf67;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d6d3289..4b504c8 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -98,10 +98,6 @@ servers:
     address: 193.201.200.129
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
-  gw-xandros:
-    address: 67.210.160.81
-    parents: gw-HP-ftc
-    hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
     parents: gw-HP-ftc
@@ -173,7 +169,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, hasvarfs, hasusrfs
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts
   raff:
     address: 192.25.206.59
     parents: spohr
@@ -185,13 +181,17 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: spohr
-    hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
+    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
+  merkel2:
+    address: 192.25.206.71
+    parents: merkel
+    hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
     hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim
   spohr2:
     address: 192.25.206.38
-    parents: rietz
+    parents: spohr
     hostgroups: secondary-IPs
   peri:
     address: 192.25.206.15
@@ -201,7 +201,7 @@ servers:
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -210,7 +210,7 @@ servers:
   paer:
     address: 192.25.206.11
     parents: spohr
-    hostgroups: computers, porterbox, lenny, hasbootfs
+    hostgroups: computers, porterbox, lenny, hasbootfs, hashomefs, single-cpu
   merulo:
     address: 192.25.206.58
     parents: spohr
@@ -244,7 +244,7 @@ servers:
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, lenny
     contacts: bzed
 #  auber:
 #    address: 82.195.75.101
@@ -254,19 +254,19 @@ servers:
   unger:
     address: 82.195.75.102
     parents: gw-man-da
-    hostgroups: computers, service, dl360, rsyslog-hosts, acpid-hosts, lenny
+    hostgroups: computers, service, dl360, acpid-hosts, lenny
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, bind9-hosts
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, heavy-exim, ulogd-hosts
 
   master:
     address: 70.103.162.29
@@ -319,15 +319,19 @@ servers:
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts
+    hostgroups: computers, single-cpu, lenny, porterbox
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
-    hostgroups: computers, service, rsyslog-hosts, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+  senfl:
+    address: 128.31.0.51
+    parents: gw-mit-csail
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
   carver:
     address: 128.31.0.50
     parents: gw-mit-csail
-    hostgroups: computers, service, rsyslog-hosts, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts
+    hostgroups: computers, service, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts
 
   klecker:
     address: 194.109.137.218
@@ -348,7 +352,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, rsyslog-hosts, acpid-hosts
+    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, acpid-hosts
     contacts: bzed
 
   pergolesi:
@@ -382,13 +386,13 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, lenny, hasvarfs
+    hostgroups: computers, buildd, lenny, hasvarfs, hashomefs
     contacts: sfrost
 
   puccini:
     address: 87.106.4.56
     parents: gw-1und1
-    hostgroups: computers, buildd, lenny, rsyslog-hosts, ulogd-hosts, hassrvfs
+    hostgroups: computers, buildd, lenny, ulogd-hosts, hassrvfs
     contacts: joerg
   powell:
     address: 87.106.64.223
@@ -407,26 +411,17 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, ulogd-hosts, lenny, rsyslog-hosts, hassrvfs
+    hostgroups: computers, ulogd-hosts, lenny, hassrvfs
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, lenny, hasbootfs, rsyslog-hosts, single-cpu
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
 
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
     hostgroups: computers, no-udev, buildd, sw-raid, lenny
 
-  elara:
-    address: 67.210.160.90
-    parents: gw-xandros
-    hostgroups: deadslow
-  europa:
-    address: 67.210.160.89
-    parents: gw-xandros
-    hostgroups: deadslow
-
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
@@ -449,11 +444,6 @@ servers:
     parents: kassia
     hostgroups: secondary-IPs
 
-  allegri:
-    address: 157.193.39.233
-    parents: gw-ghent
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs, incomingmailrelayed2025
-    contacts: luk
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
@@ -473,11 +463,11 @@ servers:
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server
   dijkstra:
     address: 137.82.84.70
     parents: gw-ubc
-    hostgroups: computers, bl460, rsyslog-hosts, acpid-hosts, lenny
+    hostgroups: computers, bl460, acpid-hosts, lenny
   brahms:
     address: 137.82.84.74
     parents: dijkstra
@@ -485,12 +475,28 @@ servers:
   geo2:
     address: 137.82.84.71
     parents: dijkstra
-    hostgroups: computers, service, lenny, hasbootfs, rsyslog-hosts, single-cpu
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
+  duarte:
+    address: 137.82.84.77
+    parents: dijkstra
+    hostgroups: computers, lenny, hasbootfs, hassrvfs
+  valente:
+    address: 137.82.84.76
+    parents: dijkstra
+    hostgroups: computers, lenny, hasbootfs, single-cpu
+  bellini:
+    address: 137.82.84.79
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, nfs-client
+  stabile:
+    address: 137.82.84.72
+    parents: gw-ubc
+    hostgroups: computers, lenny, hassrvfs, sw-raid
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts
+    hostgroups: computers, buildd, sw-raid, lenny
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
@@ -504,18 +510,18 @@ servers:
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs, incomingmailrelayed2025
+    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, lenny, hasbootfs, incomingmailrelayed2025
     contacts: holger
 
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, lenny, hashomefs
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs
 
   zelenka:
     address: 80.245.147.40
@@ -525,7 +531,7 @@ servers:
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs
+    hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs, hashomefs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
@@ -534,12 +540,12 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, dl360, bind9-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, dl360, bind9-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, rsyslog-hosts, lenny
+    hostgroups: computers, buildd, lenny
 
   lafayette:
     address: 147.215.7.160
@@ -619,9 +625,9 @@ hostgroups:
   #syslog-ng-hosts:
   #  alias: hosts running syslog-ng instead of sysklogd
   #  private: 1
-  rsyslog-hosts:
-    alias: hosts running rsyslogd instead of sysklogd
-    private: 1
+  #rsyslog-hosts:
+  #  alias: hosts running rsyslogd instead of sysklogd
+  #  private: 1
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -634,9 +640,6 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
-  apache1-hosts:
-    alias: hosts running apache1
-    private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
@@ -695,6 +698,9 @@ hostgroups:
   hassrvfs:
     alias: hosts with a /srv filesystem
     private: 1
+  hashomefs:
+    alias: hosts with a /home filesystem
+    private: 1
   hasvarfs:
     alias: hosts with a /var filesystem
     private: 1
@@ -788,7 +794,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
+    hosts: sperger, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -808,7 +814,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -818,7 +824,7 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: voltaire, rem, ball, paer, escher
+    hostgroups: hashomefs
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -839,6 +845,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x"
     hosts: caballero
+  -
+    name: disk usage on /var/lib/postgresql
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
+    hosts: samosa
+  -
+    name: disk usage on /srv/morgue.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org"
+    hosts: stabile
 
  ############ All Computers ############
  ####
@@ -883,7 +899,7 @@ services:
 
   -
     name: puppet
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-puppet"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -f /var/lib/puppet/state/state.yaml"
     hostgroups: lenny
     excludehosts: agnesi
 
@@ -967,12 +983,6 @@ services:
     normal_check_interval:  60
     notification_interval: 1440
 
-  -
-    name: "network service - sshd"
-    check: dsa_check_ssh
-    hostgroups: deadslow
-    excludehosts: agnesi
-    normal_check_interval:  180
   -
     name: "network service - sshd - 2260"
     check: dsa_check_ssh_port!2260
@@ -1047,12 +1057,12 @@ services:
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: allegri, zelenka, ancina
+    excludehosts: zelenka, ancina
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: allegri, zelenka, ancina
+    hosts: zelenka, ancina
     depends: process - xinetd
 
  ###
@@ -1066,27 +1076,26 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C cron -a /usr/sbin/cron"
     hostgroups: computers
 
- ###
- # -
- #   name: process - syslog-ng
- #   nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
- #   hostgroups: syslog-ng-hosts
  ###
   -
-    name: process - rsyslogd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
-    hostgroups: rsyslog-hosts
+    name: process - syslog-ng
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
+    hostgroups: lenny
+    excludehosts: agnesi
+ ###
+ # -
+ #   name: process - rsyslogd
+ #   nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
+ #   hostgroups: rsyslog-hosts
  ###
   -
     name: process - syslogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
-    hostgroups: computers
-    excludehostgroups: rsyslog-hosts
+    hosts: rietz, verdi
   -
     name: process - klogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
-    hostgroups: computers
-    excludehostgroups: rsyslog-hosts
+    hosts: rietz, verdi
 
  ### MAIL STUFF
  ###
@@ -1482,7 +1491,7 @@ services:
   -
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -h ldap:/// ldaps:/// -g openldap -u openldap'"
-    hosts: samosa
+    hosts: draghi
  ###
   -
     name: process - ulogd
@@ -1518,19 +1527,19 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, allegri, gluck, zelenka, ancina
+    hosts: gluck, zelenka, ancina, draghi
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, allegri, gluck, zelenka, ancina
+    excludehosts: gluck, zelenka, ancina, draghi
     excludehostgroups: rsyncd-hosts
  ###
   -
     name: network service - finger
     check: check_tcp!79
-    hosts: samosa
+    hosts: draghi
     depends: process - xinetd
  ###
   -
@@ -1568,6 +1577,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -C apache2 -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+
   -
     name: network service - http
     check: check_http
@@ -1581,37 +1591,42 @@ services:
     hosts: kassia-sec, kassia-ftp
 
 
+  # apache1 process on merkel
   -
     name: process - apache - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache -a /usr/sbin/apache"
-    hostgroups: apache1-hosts
+    hosts: merkel
   -
     name: process - apache - worker
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:75 -c 1:150 -u www-data -C apache -a /usr/sbin/apache"
-    hostgroups: apache1-hosts
-    depends: process - apache - master
-  -
-    name: network service - http
-    check: check_http
-    hostgroups: apache1-hosts
+    hosts: merkel
     depends: process - apache - master
 
+  # keyserver on raff
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
     hosts: raff
     depends: process - apache2 - master
 
+  # https on various hosts
   -
     name: network service - https
     check: check_https
-    hosts: samosa, ries, klecker
+    hosts: ries, klecker, draghi, liszt, spohr
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: samosa, ries, klecker, spohr2
+    # ries		ftp-master.debian.org
+    # klecker		security-master.debian.org
+    # spohr		rt.debian.org
+    # spohr2		nagios.debian.org
+    # draghi		db.debian.org
+    # merkel2		nm.debian.org
+    # liszt		lists.debian.org
+    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt
     depends: network service - https
     normal_check_interval: 60
 
@@ -1627,6 +1642,18 @@ services:
     check: check_http
     hosts: spohr2
     depends: "spohr:process - apache2 - master"
+  # merkel
+  -
+    name: network service - https
+    check: check_https
+    hosts: merkel2
+    depends: "merkel:process - apache2 - master"
+    normal_check_interval: 120
+  -
+    name: network service - http
+    check: check_http
+    hosts: merkel2
+    depends: "merkel:process - apache2 - master"
  ####
   -
     name: process - named
@@ -1697,11 +1724,11 @@ services:
     name: process - postresql83 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
     hostgroups: postgres83-hosts
-    excludehosts: piatti, klecker
-  -
-    name: process - postresql83 - master udd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
-    hosts: piatti
+    excludehosts: klecker
+  #-
+  #  name: process - postresql83 - master udd
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
+  #  hosts: piatti
   -
     name: process - postresql83 - dak master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
@@ -1725,7 +1752,7 @@ services:
   -
     name: process - stunnel4 - postgres-udd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
-    hosts: piatti
+    hosts: samosa
   -
     name: process - stunnel4 - postgres-udd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd.conf'"
@@ -1810,6 +1837,10 @@ services:
 
  ############ MISC OTHER Stuff ############
  #####
+  -
+    name: mirror sync - bugs
+    check: "dsa_check_mirrorsync!bugs.debian.org!project/trace/bugs-master.debian.org"
+    hosts: global
   -
     name: mirror sync - security
     check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
@@ -1822,25 +1853,29 @@ services:
     name: mirror sync - security.us
     check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
     hosts: global
+  -
+    name: DNS SOA sync - security.geo.debian.org
+    check: "dsa_check_soas!security.geo.debian.org"
+    hosts: global
   -
     name: DNS SOA sync - debian.org
-    check: "dsa_check_soas_add!samosa.debian.org!debian.org"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.org"
     hosts: global
   -
     name: DNS SOA sync - debian.net
-    check: "dsa_check_soas_add!samosa.debian.org!debian.net"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.net"
     hosts: global
   -
     name: DNS SOA sync - debian.com
-    check: "dsa_check_soas_add!samosa.debian.org!debian.com"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.com"
     hosts: global
   -
     name: DNS SOA sync - mirror.debian.net
-    check: "dsa_check_soas_add!samosa.debian.org!mirror.debian.net"
+    check: "dsa_check_soas_add!draghi.debian.org!mirror.debian.net"
     hosts: global
   -
     name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
-    check: "dsa_check_soas_add!samosa.debian.org!144-28.118.59.86.in-addr.arpa"
+    check: "dsa_check_soas_add!draghi.debian.org!144-28.118.59.86.in-addr.arpa"
     hosts: global
   -
     name: DNS SOA sync - alioth.debian.org