X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=e9fca3fe4990ed4291b8f83816128cf639114f88;hb=385d67d7a82857e99db338f3f62f972f1834a250;hp=d624e5962184bbde66c19e25e45a340df3206700;hpb=2b55d57cf5501c14c4e499a9daa54ef0b999b2ad;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d624e596..e9fca3f 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -61,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:
@@ -92,12 +92,8 @@ servers:
     address: 64.28.108.36
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-man-da:
-    address: 82.195.75.126
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-man-da2:
-    address: 82.195.78.116
+  gw-manda:
+    address: 82.195.78.118
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-marist:
@@ -461,9 +457,10 @@ servers:
     address: 5.153.231.36
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, systemd-timesyncd
-  fede:
+  bilbao:
     address: 5.153.231.37
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, systemd-timesyncd, apache2-hosts
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
@@ -488,6 +485,11 @@ servers:
     address: 5.153.231.44
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
+
+  casulana:
+    address: 5.153.231.41
+    parents: gw-bytemark
+    hostgroups: computers, service, stretch, hpnewraid, hassrvfs, dl380
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -523,6 +525,11 @@ servers:
     address: 217.196.149.228
     parents: gw-conova
     hostgroups: computers, jessie, service, sw-raid
+
+  arm-conova-01:
+    address: 217.196.149.230
+    parents: aagaard
+    hostgroups: computers, hassrvfs, buildd, jessie
   # }}}
   # {{{ gw-csail
   csail-node01:
@@ -603,39 +610,39 @@ servers:
   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
+    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
   # }}}
   # {{{ gw-isc
   mirror-isc:
@@ -702,14 +709,14 @@ servers:
     hostgroups: computers, buildd, jessie
     contacts: pkern
   # }}}
-  # {{{ gw-man-da
+  # {{{ gw-manda
   czerny:
     address: 82.195.75.109
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
   clementi:
     address: 82.195.75.103
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
   bendel:
     address: 82.195.75.100
@@ -759,7 +766,7 @@ servers:
     hostgroups: computers, service, kvmdomains, jessie
   ganeti3:
     address: 82.195.75.111
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: notacomputer
   wilder:
     address: 82.195.75.112
@@ -783,19 +790,19 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https
   mips-manda-01:
     address: 82.195.75.66
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, buildd, jessie, hassrvfs
   mipsel-manda-01:
     address: 82.195.75.72
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-02:
     address: 82.195.75.74
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-03:
     address: 82.195.75.67
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, buildd, jessie, hassrvfs
   seger:
     address: 82.195.75.93
@@ -1233,6 +1240,8 @@ hostgroups:
     alias: Hosts running jessie
   jessie-freebsd:
     alias: kFreebsd hosts running jessie
+  stretch:
+    alias: Hosts running stretch
 
   kvmdomains:
     alias: Hosts that are KVM domains
@@ -1331,9 +1340,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
@@ -1446,15 +1452,10 @@ 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
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
     hostgroups: hassrvfs
   -
     name: disk usage on /var/lib/postgresql
@@ -1602,7 +1603,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
     excludehosts: zelenka, zandonai
-    excludehostgroups: jessie
+    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"
@@ -1610,7 +1611,7 @@ services:
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
 
   -
@@ -1733,11 +1734,11 @@ services:
     name: process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
     hostgroups: computers
-    excludehostgroups: freebsd, sparc, jessie
+    excludehostgroups: freebsd, sparc, jessie, stretch
   -
     name: process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ulog -C ulogd -a '/usr/sbin/ulogd --daemon --uid ulog'"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
   -
     name: unexpected process - ulogd
@@ -1770,7 +1771,7 @@ services:
     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: computers
-    excludehostgroups: freebsd, jessie
+    excludehostgroups: freebsd, jessie, stretch
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
@@ -1778,7 +1779,7 @@ services:
   -
     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 -F'"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
 
   -
@@ -1854,6 +1855,12 @@ services:
     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, wheezy
+    servicegroups: time
   -
     name: system time synced
     nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl"
@@ -1884,7 +1891,7 @@ services:
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
-    excludehostgroups: alioth, jessie
+    excludehostgroups: alioth, jessie, stretch
   ###
   -
     name: MQ connection on rainier
@@ -1925,11 +1932,11 @@ services:
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C udevd -a 'udevd'"
     hostgroups: computers
-    excludehostgroups: freebsd, jessie
+    excludehostgroups: freebsd, jessie, stretch
   -
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C systemd-udevd -a '/lib/systemd/systemd-udevd'"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
   -
     name: unexpected process - udev
@@ -1940,7 +1947,7 @@ services:
     name: process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid'"
     hostgroups: acpid-hosts
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: unexpected process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C acpid"
@@ -1960,7 +1967,7 @@ services:
   -
     name: process - stunnel4 - puppet-ekeyd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
-    hostgroups: wheezy, jessie
+    hostgroups: wheezy, jessie, stretch
     excludehostgroups: freebsd, alioth
   -
     name: process - stunnel4 - puppet-ekeyd is crazy
@@ -2041,7 +2048,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: process - mdadm monitor
     servicegroups: raid
@@ -2186,7 +2193,7 @@ services:
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
     hostgroups: heavy-exim, heavy-postfix
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --foreground=true'"
@@ -2209,7 +2216,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: spamd
     excludehosts: picconi
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamassassin.pid --create-prefs --max-children 5 --helper-home-dir'"
@@ -2248,7 +2255,7 @@ services:
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
     hostgroups: heavy-exim
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a 'postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
@@ -2706,6 +2713,11 @@ services:
     check: "dsa_check_staticsync_nossl!deb.debian.org"
     hosts: global
     servicegroups: mirror
+  -
+    name: mirror static sync - manpages
+    check: "dsa_check_staticsync!manpages.debian.org"
+    hosts: global
+    servicegroups: mirror
 
   -
     name: mirror static sync - 10years
@@ -2753,8 +2765,8 @@ services:
     hosts: global
     servicegroups: mirror
   -
-    name: mirror static sync - debconf1
-    check: "dsa_check_staticsync!debconf1.debconf.org"
+    name: mirror static sync - debconf16
+    check: "dsa_check_staticsync!debconf16.debconf.org"
     hosts: global
     servicegroups: mirror
   -
@@ -2935,7 +2947,7 @@ services:
   -
     name: system - all services running
     nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
   ###
   -