X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=6b7c0955ef2f8f05244af6a9c5d9d3172e929a26;hb=7d4bb8d15c78dd22621dd58da42848fbbca4881d;hp=72f9786ccf9a061ae2289321e35c7703d73e7719;hpb=5a7f250f5b96145fcc171540755e4c42a92026ad;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 72f9786..6b7c095 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -33,6 +33,10 @@ servers:
     address: 130.239.18.97
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-aql:
+    address: 141.170.2.17
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-bytemark:
     address: 89.16.160.116
     parents: gw-ubcece
@@ -94,6 +98,10 @@ servers:
     address: 185.17.185.190
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-linaro:
+    address: 64.28.108.36
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-man-da:
     address: 82.195.75.126
     parents: gw-ubcece
@@ -172,6 +180,11 @@ servers:
     address: 213.165.95.6
     parents: powell
     hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
+  piu-slave-1und1-01:
+    address: 213.165.95.7
+    parents: powell
+    hostgroups: computers, service, kvmdomains, wheezy
+    contacts: holger
   # }}}
   # {{{ gw-1und1-sec
   schumann:
@@ -205,15 +218,29 @@ servers:
     parents: gw-accumu
     hostgroups: computers, buildd, hassrvfs, wheezy
   # }}}
+  # {{{ gw-aql
+  mips-aql-01:
+    address: 141.170.6.149
+    parents: gw-aql
+    hostgroups: computers, buildd, wheezy
+  mips-aql-02:
+    address: 141.170.6.150
+    parents: gw-aql
+    hostgroups: computers, buildd, wheezy
+  mipsel-aql-01:
+    address: 141.170.6.152
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid
+  mipsel-aql-02:
+    address: 141.170.6.153
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid
+  # }}}
   # {{{ gw-arm
   abel:
     address: 217.140.96.56
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, broken_mq
-  antheil:
-    address: 217.140.96.60
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
   arnold:
     address: 217.140.96.57
     parents: gw-arm
@@ -234,18 +261,14 @@ servers:
     address: 217.140.96.67
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
-  hasse:
-    address: 217.140.96.68
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
-  henze:
-    address: 217.140.96.70
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, broken_mq
+  ia64-arm-01:
+    address: 217.140.96.61
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd, broken_mq, sw-raid, acpid-hosts
   # }}}
   # {{{ gw-brown
   franck:
@@ -348,11 +371,7 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts
-  backuphost:
-    address: 5.153.231.12
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
@@ -426,11 +445,19 @@ servers:
   x86-bm-01:
     address: 5.153.231.32
     parents: ganeti-bytemark
-    hostgroups: computers, wheezy, no-bacula
-  fischer:
-    address: 5.153.231.33
+    hostgroups: computers, kvmdomains, wheezy, acpid-hosts, no-bacula
+  gideon:
+    address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
+  httpredir-bm-01:
+    address: 5.153.231.35
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+  lindsay:
+    address: 5.153.231.36
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -474,10 +501,36 @@ servers:
     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
     hostgroups: computers, service, dl360, acpid-hosts, wheezy, drbd-hosts
+  csail-node02:
+    address: 128.31.0.46
+    parents: gw-csail
+    hostgroups: computers, service, dl360, acpid-hosts, wheezy, drbd-hosts
+  ganeti-csail:
+    address: 128.31.0.49
+    parents: gw-bytemark
+    hostgroups: notacomputer
+
+  falla:
+    address: 128.31.0.65
+    parents: ganeti-csail
+    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
+  fischer:
+    address: 128.31.0.35
+    parents: ganeti-csail
+    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
+  mirror-csail:
+    address: 128.31.0.62
+    parents: ganeti-csail
+    hostgroups: computers, service, hassrvfs, kvmdomains, wheezy, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https
+  x86-csail-01:
+    address: 128.31.0.50
+    parents: ganeti-csail
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   # }}}
   # {{{ gw-dgi
   storace:
@@ -492,10 +545,26 @@ servers:
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hassrvfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-grnet
+  ganeti-grnet:
+    address: 194.177.211.194
+    parents: gw-grnet
+    hostgroups: notacomputer
+  grnet-node01:
+    address: 194.177.211.195
+    parents: gw-grnet
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
+  grnet-node02:
+    address: 194.177.211.196
+    parents: gw-grnet
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, squeeze, nfs-server
+    hostgroups: computers, acpid-hosts, megaraid, service, wheezy
+  loghost-grnet-01:
+    address: 194.177.211.200
+    parents: gw-grnet
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
   # }}}
   # {{{ gw-isc
   schein:
@@ -530,6 +599,20 @@ servers:
     hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-client, autofs, hassrvfs
   #, apache2-hosts
   # }}}
+  # {{{ gw-linaro
+  arm-linaro-01:
+    address: 64.28.108.83
+    parents: gw-linaro
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+  arm-linaro-03:
+    address: 64.28.108.85
+    parents: gw-linaro
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+  asachi:
+    address: 64.28.108.84
+    parents: gw-linaro
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, broken_mq
+  # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
     address: 129.143.160.6
@@ -561,11 +644,11 @@ servers:
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, spamd, heavy-exim, highload
   mipsel-manda-01:
     address: 82.195.75.72
-    parents: gw-arm
+    parents: gw-man-da
     hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
   mipsel-manda-02:
     address: 82.195.75.74
-    parents: gw-arm
+    parents: gw-man-da
     hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
   fils:
     address: 82.195.75.89
@@ -585,10 +668,6 @@ servers:
     address: 82.195.75.99
     parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs
-  rem:
-    address: 82.195.75.68
-    parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, wheezy
   draghi:
     address: 82.195.75.106
     parents: ganeti3
@@ -629,6 +708,10 @@ servers:
     address: 82.195.75.92
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy
+  wolkenstein:
+    address: 82.195.75.65
+    parents: ganeti3
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
@@ -699,7 +782,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres91-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts, hasvarlogfs
+    hostgroups: computers, acpid-hosts, postgres91-hosts, service, apache2-hosts, sw-raid, wheezy, rsyncd-hosts, xinetd-hosts, hasvarlogfs
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -790,10 +873,6 @@ servers:
     address: 206.12.19.118
     parents: ganeti2
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
-  wolkenstein:
-    address: 206.12.19.116
-    parents: ganeti2
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
   brahms:
     address: 206.12.19.115
     parents: ganeti2
@@ -810,10 +889,6 @@ servers:
     # unless we implement runfrom for host alive checks
     pingable: false
     check_command: dsa_check_always_ok
-  falla:
-    address: 206.12.19.117
-    parents: ganeti2
-    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
   fano:
     address: 206.12.19.110
     parents: ganeti2
@@ -930,11 +1005,6 @@ servers:
     hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
   # }}}
   # {{{ gw-ugent
-  ancina:
-    address: 157.193.39.13
-    parents: gw-ugent
-    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, wheezy
-    contacts: luk
   # }}}
   # {{{ gw-umn
   saens:
@@ -947,9 +1017,13 @@ servers:
     address: 143.106.167.145
     parents: gw-unicamp
     hostgroups: layer3-infrastructure
+  prokofiev:
+    address: 143.106.167.147
+    parents: gw-unicamp
+    hostgroups: computers, jessie, acpid-hosts, service
   powerpc-unicamp-01:
     address: 143.106.167.149
-    parents: asgard
+    parents: prokofiev
     hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
   # }}}
   # {{{ gw-utwente
@@ -971,11 +1045,15 @@ servers:
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-ynic
-  howells:
+  henze:
+    address: 144.32.168.74
+    parents: gw-ynic
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
+  hasse:
     address: 144.32.168.75
     parents: gw-ynic
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
-  hummel:
+  antheil:
     address: 144.32.168.76
     parents: gw-ynic
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
@@ -987,6 +1065,18 @@ servers:
     address: 144.32.168.77
     parents: gw-ynic
     hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
+  #antheil:
+  #  address: 217.140.96.60
+  #  parents: gw-arm
+  #  hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+  #hasse:
+  #  address: 217.140.96.68
+  #  parents: gw-arm
+  #  hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
+  #henze:
+  #  address: 217.140.96.70
+  #  parents: gw-arm
+  #  hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
   # }}}
   # {{{ gw-zivit
   zandonai:
@@ -1085,6 +1175,8 @@ hostgroups:
     alias: Hosts running squeeze
   wheezy:
     alias: Hosts running wheezy
+  jessie:
+    alias: Hosts running jessie
 
   kvmdomains:
     alias: Hosts that are KVM domains
@@ -1292,7 +1384,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 95 98"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x /srv/farm-snapshot/farm-misc 95 98"
     hosts: sibelius
 
   -
@@ -1356,9 +1448,24 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-misc
+    name: disk usage on /srv/farm-snapshot/farm-1
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-misc"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-1"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-3
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-3"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-4
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4"
     hosts: sibelius
   -
     name: disk usage on /var/lib/postgresql/9.1
@@ -1446,6 +1553,12 @@ 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
+  -
+    name: process - getty
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
+    hostgroups: computers
+    hostgroups: jessie
   -
     name: processes - zombies
     nrpe: "/usr/lib/nagios/plugins/check_procs 5 10 -s Z"
@@ -1469,7 +1582,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: backuphost
+    excludehosts: storace
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1477,7 +1590,7 @@ services:
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: backuphost
+    hosts: storace
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1546,7 +1659,12 @@ 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
+    excludehostgroups: freebsd, sparc, jessie
+  -
+    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
+    excludehostgroups: freebsd
   -
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
@@ -1597,6 +1715,12 @@ services:
     runfrom: lully
     hostgroups: computers
     excludehostgroups: alioth
+  -
+    name: remote logging on loghost-grnet-01
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+    runfrom: loghost-grnet-01
+    hostgroups: computers
+    excludehostgroups: alioth
   # }}}
   # {{{ base service
   -
@@ -1636,7 +1760,7 @@ services:
   -
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'"
-    hostgroups: wheezy
+    hostgroups: wheezy, jessie
     excludehostgroups: freebsd
   -
     name: network service - munin-node
@@ -1654,14 +1778,6 @@ services:
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: ancina
-    servicegroups: time
-  ###
-  -
-    name: network service - time
-    check: dsa_check_time
-    hosts: ancina
-    depends: process - xinetd
     servicegroups: time
   ###
   -
@@ -1762,7 +1878,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: squeeze, wheezy
+    hostgroups: squeeze, wheezy, jessie
     excludehostgroups: freebsd, alioth
   # }}}
   # {{{ anti-services
@@ -1808,16 +1924,15 @@ services:
   -
     name: process - mdadm monitor
     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 /var/run/mdadm/monitor.pid --daemonise --scan'"
+    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: wheezy
+    excludehostgroups: jessie
   -
-    # wheezy:
     name: process - mdadm monitor
     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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --scan'"
     hostgroups: sw-raid
-    excludehostgroups: squeeze
+    hostgroups: jessie
   -
     name: RAID - sw raid
     servicegroups: raid
@@ -2237,7 +2352,7 @@ services:
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
-    hosts: backuphost
+    hosts: storace
   # }}}
   # {{{ power
 #  -
@@ -2536,6 +2651,17 @@ services:
     hosts: gombert
     contact_groups: gobby
   ####
+  -
+    name: network service - sip-tls cert - 443
+    check: dsa_check_cert!443
+    normal_check_interval: 60
+    hosts: vogler
+  -
+    name: network service - sip-tls cert - 5061
+    check: dsa_check_cert!5061
+    normal_check_interval: 60
+    hosts: vogler
+  ####
   -
     name: puppetmaster cert
     nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"