X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b80599265d44998a6d5a226aef66a00c672f2b57;hb=ab99758429c0b815b95f2d16f7ec3a4d910579ac;hp=9a2ba27caab25ad3bead154f0237b6fa03a246fe;hpb=2230997e24a165f489edd89ae2f6ed760980b774;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9a2ba27..b805992 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -57,10 +57,6 @@ servers:
     address: 138.16.160.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-carnet:
-    address: 161.53.160.1
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-conova:
     address: 217.196.149.238
     parents: gw-ubcece
@@ -246,6 +242,10 @@ servers:
     address: 141.170.6.153
     parents: gw-aql
     hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid
+  mipsel-aql-03:
+    address: 141.170.6.158
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, hassrvfs
   # }}}
   # {{{ gw-arm
   abel:
@@ -290,64 +290,68 @@ servers:
     address: 138.16.160.12
     parents: gw-brown
     hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
+  fasolo:
+    address: 138.16.160.17
+    parents: gw-brown
+    hostgroups: computers, service, dl380, hpnewraid, jessie
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
     address: 5.153.231.241
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl9:
     address: 5.153.231.249
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl10:
     address: 5.153.231.250
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl11:
     address: 5.153.231.251
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl12:
     address: 5.153.231.252
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl13:
     address: 5.153.231.253
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl14:
     address: 5.153.231.254
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
 
   milanollo:
     address: 5.153.231.2
@@ -364,7 +368,7 @@ servers:
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
@@ -457,6 +461,10 @@ servers:
     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
+  respighi:
+    address: 5.153.231.29
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
@@ -516,16 +524,6 @@ servers:
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
     contacts: faw
   # }}}
-  # {{{ gw-carnet
-  lebrun:
-    address: 193.198.184.10
-    parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, wheezy
-  schroeder:
-    address: 193.198.184.11
-    parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, wheezy
-  # }}}
   # {{{ gw-cecsit
   gluck:
     address: 150.203.164.38
@@ -666,7 +664,7 @@ servers:
   porta:
     address: 194.177.211.207
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-hosts, xinetd-hosts
   # }}}
   # {{{ gw-isc
   schein:
@@ -787,7 +785,7 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, jessie
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, jessie, apache-https
   stockhausen:
     address: 82.195.75.108
     parents: ganeti3
@@ -874,15 +872,6 @@ servers:
     address: 140.211.15.152
     parents: gw-osuosl
     hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid
-  rietz:
-    address: 140.211.166.43
-    parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, xinetd-hosts, jessie
-    #, bosserver
-  rietz2:
-    address: 140.211.166.44
-    parents: rietz
-    hostgroups: secondary-IPs
   # }}}
   # {{{ gs-rapidswitch
   caballero:
@@ -894,7 +883,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, xinetd-hosts, hasvarlogfs
+    hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, xinetd-hosts, hasvarlogfs, multipath-hosts
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -944,27 +933,27 @@ servers:
   ubc-bl7:
     address: 206.12.19.217
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ubc-bl6:
     address: 206.12.19.216
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ubc-bl2:
     address: 206.12.19.212
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ubc-bl3:
     address: 206.12.19.213
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ubc-bl4:
     address: 206.12.19.214
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ubc-bl8:
     address: 206.12.19.218
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ganeti2:
     address: 206.12.19.23
     parents: sw-ubcece-kais
@@ -999,10 +988,6 @@ servers:
     address: 206.12.19.15
     parents: sw-ubcece-kais
     hostgroups: computers, buildd, jessie
-  traetta:
-    address: 206.12.19.21
-    parents: sw-ubcece-kais
-    hostgroups: computers, dl585, service, jessie
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
@@ -1222,9 +1207,6 @@ hostgroups:
   dl380:
     alias: HP DL380 hosts
     private: 1
-  dl385:
-    alias: HP DL385 hosts
-    private: 1
   dl360:
     alias: HP DL360 hosts
     private: 1
@@ -1234,9 +1216,6 @@ hostgroups:
   bm-bl:
     alias: HP blades at bytemark
     private: 1
-  dl585:
-    alias: HP DL385 hosts
-    private: 1
   dl180:
     alias: HP DL180
     private: 1
@@ -1266,6 +1245,8 @@ hostgroups:
 
   drbd-hosts:
     alias: hosts running drbd
+  multipath-hosts:
+    alias: hosts running multipathd
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -1414,6 +1395,8 @@ servicegroups:
   security:
     alias: security
     servicegroup_members: apt, kernel, samhain
+  mirror:
+    alias: mirror stuff
   MQ:
     alias: rabbitMQ stuff
 # }}}
@@ -1449,17 +1432,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -X nfs4 --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount|/proc/sys/fs/binfmt_misc'"
     hostgroups: computers
-    excludehosts: sibelius, rietz
+    excludehosts: sibelius
   -
     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 -x nfs4 -x /srv/farm-snapshot/farm-misc 95 98"
     hosts: sibelius
-  -
-    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 -x nfs4 -x /srv -x /home 95 98"
-    hosts: rietz
 
   -
     name: disk usage on /
@@ -2078,8 +2056,8 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl180
-    excludehosts: schein, rietz
+    hostgroups: dl380, dl360, bl460, dl180
+    excludehosts: schein
     excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
@@ -2092,19 +2070,13 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
-    hosts: schein, rietz
+    hosts: schein
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli-enclosure 1 1E:1"
     check_interval: 120
     hosts: franck
-  -
-    name: HW - hpacucli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
-    check_interval: 120
-    hostgroups: dl585
   -
     name: HW - hpssacli status
     servicegroups: raid
@@ -2122,7 +2094,7 @@ services:
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
+    hostgroups: dl380, dl360, bl460, bm-bl
     excludehosts: villa, lobos, schein, storace, mirror-anu
   -
     name: HW - hpasmcli status
@@ -2609,10 +2581,12 @@ services:
     name: mirror sync - bugs
     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"
     hosts: global
+    servicegroups: mirror
   -
     name: mirror sync - packages
     check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"
@@ -2620,6 +2594,7 @@ services:
     check_interval: 15
     max_check_attempts: 5
     retry_check_interval: 5
+    servicegroups: mirror
   -
     name: mirror sync - snapshot
     check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!3600:28800"
@@ -2627,6 +2602,184 @@ services:
     check_interval: 15
     max_check_attempts: 5
     retry_check_interval: 5
+    servicegroups: mirror
+
+  -
+    name: mirror static sync - bits
+    check: "dsa_check_staticsync!bits.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - network-test
+    check: "dsa_check_staticsync!network-test.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - appstream
+    check: "dsa_check_staticsync!appstream.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - blends
+    check: "dsa_check_staticsync!blends.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - d-i
+    check: "dsa_check_staticsync!d-i.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debaday
+    check: "dsa_check_staticsync!debaday.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debdeltas
+    check: "dsa_check_staticsync!debdeltas.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - dsa
+    check: "dsa_check_staticsync!dsa.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - lintian
+    check: "dsa_check_staticsync!lintian.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - mozilla
+    check: "dsa_check_staticsync!mozilla.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - news
+    check: "dsa_check_staticsync!news.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - incoming.ports
+    check: "dsa_check_staticsync!incoming.ports.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - release
+    check: "dsa_check_staticsync!release.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - rtc
+    check: "dsa_check_staticsync!rtc.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - security-team
+    check: "dsa_check_staticsync!security-team.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - wnpp-by-tags
+    check: "dsa_check_staticsync!wnpp-by-tags.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - www.ports
+    check: "dsa_check_staticsync!www.ports.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - timeline
+    check: "dsa_check_staticsync!timeline.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - backports
+    check: "dsa_check_staticsync!backports.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - incoming
+    check: "dsa_check_staticsync!incoming.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - metadata.ftp-master
+    check: "dsa_check_staticsync!metadata.ftp-master.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - deb
+    check: "dsa_check_staticsync!deb.debian.org"
+    hosts: global
+    servicegroups: mirror
+
+  -
+    name: mirror static sync - 10years
+    check: "dsa_check_staticsync!10years.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf0
+    check: "dsa_check_staticsync!debconf0.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf1
+    check: "dsa_check_staticsync!debconf1.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf2
+    check: "dsa_check_staticsync!debconf2.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf3
+    check: "dsa_check_staticsync!debconf3.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf4
+    check: "dsa_check_staticsync!debconf4.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf5
+    check: "dsa_check_staticsync!debconf5.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf6
+    check: "dsa_check_staticsync!debconf6.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf7
+    check: "dsa_check_staticsync!debconf7.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf1
+    check: "dsa_check_staticsync!debconf1.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - es
+    check: "dsa_check_staticsync!es.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - fr
+    check: "dsa_check_staticsync!fr.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - miniconf10
+    check: "dsa_check_staticsync!miniconf10.debconf.org"
+    hosts: global
+    servicegroups: mirror
   # }}}
   # {{{ DNS
   -
@@ -2720,6 +2873,16 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=11298 $HOSTADDRESS$ public"
     runfrom: ubc-bl8
     hosts: giustini
+  ###
+  -
+    name: process - multipathd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:15 -c 1: -u root -C multipathd -a '/sbin/multipathd'"
+    hostgroups: multipath-hosts
+  -
+    name: unwanted process - multipathd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C multipathd"
+    hostgroups: computers
+    excludehostgroups: multipath-hosts
   # }}}
   # {{{ porterbox
   -
@@ -2778,11 +2941,6 @@ services:
     hostgroups: jessie
     excludehostgroups: freebsd
   ###
-  -
-    name: process - rngd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd  -a '/usr/sbin/rngd -r /dev/hwrng'"
-    hostgroups: dl385
-  ###
   -
     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'"
@@ -2805,12 +2963,6 @@ services:
     check: check_tcp!873
     hostgroups: rsyncd-hosts
     depends: process - xinetd
-    excludehosts: rietz
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: rietz2
-    depends: rietz:process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873