X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=1857fa541b324723406b89336d729a0fb108f002;hb=3b5d50a311f844a75dcfbd1f56d8562b9899da91;hp=52796f0b57186039f5a87fa5387eb324b50534fe;hpb=82de443ecb9ae4e017705dbe84f3cbd30f03dcf3;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 52796f0..1857fa5 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -19,11 +19,6 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
-  gw-1und1:
-    parents: gw-ubcece
-    hostgroups: notacomputer
-    pingable: false
-    check_command: dsa_check_always_ok
   gw-1und1-sec:
     parents: gw-ubcece
     hostgroups: notacomputer
@@ -66,7 +61,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-dgi:
-    address: 93.94.131.13
+    address: 93.94.130.190
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-freenet:
@@ -82,11 +77,11 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-isc:
-    address: 149.20.20.1
+    address: 149.20.65.129
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-karlsruhe:
-    address: 129.143.57.177
+    address: 129.143.59.214
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-leaseweb:
@@ -166,12 +161,6 @@ servers:
     hostgroups: layer3-infrastructure
   # }}}
   # {{{ servers
-  # {{{ gw-1und1
-  powell:
-    address: 87.106.64.223
-    parents: gw-1und1
-    hostgroups: computers, service, jessie
-  # }}}
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
@@ -272,7 +261,7 @@ servers:
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
@@ -339,7 +328,7 @@ servers:
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, xinetd-hosts, systemd-timesyncd
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
@@ -347,33 +336,33 @@ servers:
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server, systemd-timesyncd
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie
+    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, 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
+    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   binet:
     address: 5.153.231.8
     parents: gw-bytemark
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
   ganeti-bytemark:
     address: 82.195.75.111
     parents: gw-bytemark
@@ -381,39 +370,39 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts, systemd-timesyncd
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie
+    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
   rapoport:
     address: 5.153.231.15
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie
+    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
+    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts, systemd-timesyncd
   dinis:
     address: 5.153.231.19
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
   moszumanska:
     address: 5.153.231.21
     parents: ganeti-bytemark
@@ -423,82 +412,79 @@ servers:
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ticharich:
     address: 5.153.231.23
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https
+    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
   olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie
+    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, porterbox
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, porterbox, systemd-timesyncd
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   x86-bm-01:
     address: 5.153.231.32
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, no-bacula
+    hostgroups: computers, kvmdomains, jessie, no-bacula, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   httpredir-bm-01:
     address: 5.153.231.35
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, systemd-timesyncd
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client
-  fede:
-    address: 5.153.231.37
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, systemd-timesyncd
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client, systemd-timesyncd
   jerea:
     address: 5.153.231.39
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   mekeel:
     address: 5.153.231.40
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
   pinel:
     address: 5.153.231.42
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim, systemd-timesyncd
   rusca:
     address: 5.153.231.43
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   manziarly:
     address: 5.153.231.44
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -536,11 +522,6 @@ servers:
     hostgroups: computers, jessie, service, sw-raid
   # }}}
   # {{{ gw-csail
-  steffani:
-    address: 128.31.0.36
-    parents: gw-csail
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
-
   csail-node01:
     address: 128.31.0.16
     parents: gw-csail
@@ -565,31 +546,31 @@ 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
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https, systemd-timesyncd
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   x86-csail-02:
     address: 128.31.0.68
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   httpredir-csail-01:
     address: 128.31.0.66
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, systemd-timesyncd
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https, systemd-timesyncd
   pkgmirror-csail:
     address: 128.31.0.51
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd
   usper:
     address: 128.31.0.69
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, xinetd-hosts, queued
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, xinetd-hosts, queued, systemd-timesyncd
   # }}}
   # {{{ gw-dgi
   storace:
@@ -616,62 +597,58 @@ servers:
     address: 194.177.211.196
     parents: gw-grnet
     hostgroups: computers, service, dl380, jessie, drbd-hosts
-  rautavaara:
-    address: 194.177.211.199
-    parents: gw-grnet
-    hostgroups: computers, megaraid, service, jessie
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   geo3:
     address: 194.177.211.201
     parents: gw-grnet
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie, systemd-timesyncd
   cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, xinetd-hosts, systemd-timesyncd
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   gigault:
     address: 194.177.211.204
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+    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
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https, systemd-timesyncd
   boott:
     address: 194.177.211.206
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   porta:
     address: 194.177.211.207
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-hosts, xinetd-hosts, systemd-timesyncd
+  melartin:
+    address: 194.177.211.208
+    parents: ganeti-grnet
+    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
   # }}}
   # {{{ gw-isc
-  schein:
-    address: 149.20.20.6
-    parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
   mirror-isc:
-    address: 149.20.20.7
+    address: 149.20.4.13
     parents: gw-isc
     hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
   mirror-isc2:
-    address: 149.20.20.19
+    address: 149.20.4.14
     parents: mirror-isc
     hostgroups: secondary-IPs
   mirror-isc3:
-    address: 149.20.20.22
+    address: 149.20.4.15
     parents: mirror-isc
     hostgroups: secondary-IPs
   mirror-isc-syncproxy:
-    address: 149.20.20.21
+    address: 149.20.4.16
     parents: mirror-isc
     hostgroups: secondary-IPs
   # }}}
@@ -972,19 +949,19 @@ servers:
   ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
-  ubc-enc2bl2:
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
-  ubc-enc2bl9:
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
   rachmaninoff:
     address: 209.87.16.20
     parents: ubc-gateway
@@ -1228,6 +1205,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  bl460g8:
+    alias: HP BL460 Gen8 blades
+    private: 1
   bm-bl:
     alias: HP blades at bytemark
     private: 1
@@ -1243,9 +1223,6 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
-  megaraid:
-    alias: Hosts with LSI Logic MegaRAID
-    private: 1
 
   wheezy:
     alias: Hosts running wheezy
@@ -1333,6 +1310,9 @@ hostgroups:
   autofs:
     alias: hosts running the automounter
     private: 1
+  systemd-timesyncd:
+    alias: Vms running systemd-timesyncd
+    private: 1
 
   highload:
     alias: "hosts on which high load is normal"
@@ -1348,9 +1328,6 @@ hostgroups:
   hassrvfs:
     alias: hosts with a /srv filesystem
     private: 1
-  hasorgfs:
-    alias: hosts with a /org filesystem
-    private: 1
   hasvarlogfs:
     alias: hosts with a /var/log filesystem
     private: 1
@@ -1463,11 +1440,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
     hostgroups: hasbootfs
-  -
-    name: disk usage on /org
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hostgroups: hasorgfs
   -
     name: disk usage on /srv
     servicegroups: diskspace
@@ -1553,6 +1525,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/morgue.debian.org"
     hosts: lw03
+  -
+    name: disk usage on /srv/QNAP-big/
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-big"
+    hosts: storace
+  -
+    name: disk usage on /srv/QNAP-tiny
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-tiny"
+    hosts: storace
   # }}}
   # {{{ ### system
   # {{{ setup
@@ -1591,11 +1573,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl2, ubc-enc2bl9, ubc-enc2bl10
+    excludehosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl02, ubc-enc2bl09, ubc-enc2bl10, fasolo
   -
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
-    hosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl2, ubc-enc2bl9, ubc-enc2bl10
+    hosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl02, ubc-enc2bl09, ubc-enc2bl10, fasolo
   -
     name: swap usage - percent
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%"
@@ -1852,13 +1834,26 @@ services:
     name: process - ntpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -p 1 -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
+    excludehostgroups: systemd-timesyncd
     servicegroups: time
   -
     name: network service - ntp
     check: dsa_check_ntp
     hostgroups: computers
+    excludehostgroups: systemd-timesyncd
     depends: process - ntpd
     servicegroups: time
+  -
+    name: system time synced
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl -s"
+    hostgroups: computers
+    excludehostgroups: systemd-timesyncd, freebsd
+    servicegroups: time
+  -
+    name: system time synced
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl"
+    hostgroups: systemd-timesyncd
+    servicegroups: time
   ###
   -
     name: process - atd
@@ -2065,8 +2060,8 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
-    hostgroups: dl380, dl360, bl460, dl180
-    excludehosts: schein, busoni
+    hostgroups: dl380, dl360, bl460, bl460g8, dl180
+    excludehosts: busoni
     excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
@@ -2079,7 +2074,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
-    hosts: schein, busoni
+    hosts: busoni
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2098,13 +2093,13 @@ services:
 #    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
 #    check_interval: 120
     #hostgroups: computers
-    #excludehosts: villa, lobos, schein
+    #excludehosts: villa, lobos
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     check_interval: 120
     hostgroups: dl380, dl360, bl460, bm-bl
-    excludehosts: villa, lobos, schein, storace, mirror-anu
+    excludehosts: villa, lobos, storace, mirror-anu
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
@@ -2115,11 +2110,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant  --ignore-failed='PS2'"
     check_interval: 120
     hosts: lobos
-  -
-    name: HW - hpasmcli status
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
-    check_interval: 120
-    hosts: schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
@@ -2131,24 +2121,12 @@ services:
     check_interval: 120
     hosts: mirror-anu
   ###
-  -
-    name: RAID - 3ware
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
-    hosts: powell
-  ###
   -
     name: RAID - aacraid
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-aacraid"
     hostgroups: aacraid
   ###
-  -
-    name: RAID - megaraid
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megaraid"
-    hostgroups: megaraid
-  ###
   -
     name: RAID - DRBD
     servicegroups: raid
@@ -2862,6 +2840,11 @@ services:
     hosts: global
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-statusfile /srv/dns.debian.org/var/nagios/ds"
     runfrom: denis
+  -
+    name: DNS - zones signed properly
+    hosts: global
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-signature-all"
+    runfrom: denis
   # }}}
   # {{{ storage
   -