X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=37fa5ba51a47f52caf0caae452ff78e4bad8a826;hb=e6de3217055cbb491bd2beb171add541afb50b3b;hp=26b84c3e7343796a044dabf86f82832c10fe50dc;hpb=18205c8fe72368bdd0c3b6e56758c796d4f98ded;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 26b84c3..37fa5ba 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -74,10 +74,6 @@ servers:
     address: 62.104.23.249
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-ftcollins:
-    address: 192.25.206.1
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-gatech:
     address: 128.61.240.1
     parents: gw-ubcece
@@ -143,6 +139,10 @@ servers:
     address: 128.101.240.222
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-unicamp:
+    address: 143.106.167.234
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-utwente:
     address: 130.89.149.1
     parents: gw-ubcece
@@ -172,6 +172,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:
@@ -218,6 +223,14 @@ servers:
     address: 217.140.96.57
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+  arm-arm-01:
+    address: 217.140.96.58
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+  arm-arm-02:
+    address: 217.140.96.59
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
   harris:
     address: 217.140.96.66
     parents: gw-arm
@@ -340,7 +353,7 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
@@ -390,7 +403,7 @@ servers:
   ticharich:
     address: 5.153.231.23
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, apache2-hosts, apache-https, service
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
@@ -414,7 +427,23 @@ servers:
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
+  x86-bm-01:
+    address: 5.153.231.32
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy, acpid-hosts, no-bacula
+  fischer:
+    address: 5.153.231.33
+    parents: ganeti-bytemark
+    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
+  gideon:
+    address: 5.153.231.34
+    parents: ganeti-bytemark
+    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
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -458,6 +487,14 @@ 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
   # }}}
   # {{{ gw-dgi
   storace:
@@ -465,20 +502,6 @@ servers:
     parents: gw-dgi
     hostgroups: computers, acpid-hosts, wheezy, dl380, nfs-client, hassrvfs
   # }}}
-  # {{{ gw-ftcollins
-  #alkman:
-  #  address: 192.25.206.63
-  #  parents: gw-ftcollins
-  #  hostgroups: computers, buildd, acpid-hosts, wheezy
-  #mundy:
-  #  address: 192.25.206.62
-  #  parents: gw-ftcollins
-  #  hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, wheezy
-  spohr:
-    address: 192.25.206.33
-    parents: gw-ftcollins
-    hostgroups: computers, service, dl380, apache2-hosts, wheezy, no-bacula
-  # }}}
   # {{{ gw-gatech
   sechter:
     address: 128.61.240.73
@@ -486,22 +509,10 @@ servers:
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hassrvfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-grnet
-  barber:
-    address: 194.177.211.203
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
-  biber:
-    address: 194.177.211.204
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, megaraid, service, squeeze, nfs-server
-  vitry:
-    address: 194.177.211.206
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, no-bacula, wheezy
   # }}}
   # {{{ gw-isc
   schein:
@@ -525,20 +536,11 @@ servers:
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-server, postgres91-hosts
-  lw05:
-    address: 185.17.185.181
-    parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid, nfs-client, autofs, hassrvfs, apache2-hosts
-  lw06:
-    address: 185.17.185.182
-    parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid, nfs-client, autofs, hassrvfs, apache2-hosts
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180, nfs-server
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-client, autofs, hassrvfs
-  #, apache2-hosts
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-client, autofs, hassrvfs, postgres91-hosts, apache2-hosts
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
@@ -574,6 +576,14 @@ servers:
     address: 82.195.75.110
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, spamd, heavy-exim, highload
+  mipsel-manda-01:
+    address: 82.195.75.72
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+  mipsel-manda-02:
+    address: 82.195.75.74
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
   fils:
     address: 82.195.75.89
     parents: ganeti3
@@ -595,11 +605,7 @@ servers:
   rem:
     address: 82.195.75.68
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, wheezy
-  unger:
-    address: 82.195.75.102
-    parents: gw-man-da
-    hostgroups: computers, service, dl360, acpid-hosts, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, no-bacula
   draghi:
     address: 82.195.75.106
     parents: ganeti3
@@ -643,11 +649,11 @@ servers:
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
-    hostgroups: computers, buildd, wheezy, hassrvfs
-  #mipsel-manda-02:
-  #  address: 82.195.75.74
-  #  parents: gw-man-da
-  #  hostgroups: computers, buildd, wheezy, hassrvfs
+    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
+  mipsel-manda-02:
+    address: 82.195.75.74
+    parents: gw-man-da
+    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
   # }}}
   # {{{ gw-marist
   zani:
@@ -729,10 +735,6 @@ servers:
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-sil
-  beethoven:
-    address: 86.59.118.146
-    parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, service, acpid-hosts, wheezy
   eder:
     address: 86.59.118.151
     parents: gw-sil
@@ -772,7 +774,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: sw-ubcece-kais
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, uploadqueue, hasorgfs, xinetd-hosts, wheezy, autofs
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, hasorgfs, wheezy, autofs
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
@@ -817,10 +819,6 @@ servers:
     address: 206.12.19.113
     parents: ganeti2
     hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
-  stabile:
-    address: 206.12.19.13
-    parents: sw-ubcece-kais
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -843,10 +841,6 @@ servers:
     parents: ganeti2
     hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
-  fischer:
-    address: 206.12.19.112
-    parents: ganeti2
-    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
@@ -953,11 +947,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:
@@ -965,6 +954,16 @@ servers:
     parents: gw-umn
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
+  # {{{ gw-unicamp
+  asgard:
+    address: 143.106.167.145
+    parents: gw-unicamp
+    hostgroups: layer3-infrastructure
+  powerpc-unicamp-01:
+    address: 143.106.167.149
+    parents: asgard
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+  # }}}
   # {{{ gw-utwente
   klecker:
     address: 130.89.148.10
@@ -1093,9 +1092,6 @@ hostgroups:
   megaraid:
     alias: Hosts with LSI Logic MegaRAID
     private: 1
-  mptraid:
-    alias: Hosts with LSI Logic Fusion-MPT
-    private: 1
 
   squeeze:
     alias: Hosts running squeeze
@@ -1195,9 +1191,6 @@ hostgroups:
   hasorgfs:
     alias: hosts with a /org filesystem
     private: 1
-  hashomefs:
-    alias: hosts with a /home filesystem
-    private: 1
   hasvarfs:
     alias: hosts with a /var filesystem
     private: 1
@@ -1307,12 +1300,7 @@ 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 --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount'"
     hostgroups: computers
-    excludehosts: sibelius,stabile
-  -
-    name: disk usage - all
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 3%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/srv/snapshot.debian.org"
-    hosts: stabile
+    excludehosts: sibelius
   -
     name: disk usage - all
     servicegroups: diskspace
@@ -1324,12 +1312,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
     hostgroups: computers
-    excludehosts: spohr
-  -
-    name: disk usage on /
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1360,16 +1342,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
     hostgroups: hasusrfs
-  -
-    name: disk usage on /home
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hostgroups: hashomefs
   -
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: sibelius, busoni, buxtehude, lw04
+    hosts: sibelius, busoni, buxtehude, lw07
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1384,12 +1361,7 @@ services:
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/mirrors"
-    hosts: beethoven, sibelius
-  -
-    name: disk usage on /srv/snapshot.debian.org
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 98 99 /srv/snapshot.debian.org"
-    hosts: stabile
+    hosts: sibelius
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
@@ -1410,26 +1382,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/ftp-master.debian.org"
     hosts: franck
-  -
-    name: disk usage on /srv/pgbackup
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/pgbackup"
-    hosts: beethoven
-  -
-    name: disk usage on /srv/git-backup
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/git-backup"
-    hosts: beethoven
-  -
-    name: disk usage on /srv/da-backup
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/da-backup"
-    hosts: beethoven
-  -
-    name: disk usage on /srv/bacula
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/bacula"
-    hosts: beethoven
   -
     name: disk usage on /storage/snapshot-farm-1
     servicegroups: diskspace
@@ -1537,7 +1489,7 @@ services:
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: beethoven, backuphost
+    hosts: backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1714,14 +1666,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
   ###
   -
@@ -1916,11 +1860,10 @@ services:
     normal_check_interval: 120
     hostgroups: dl585
   ###
-  -
-    name: HW - edac status
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
-    normal_check_interval: 120
-    hosts: lw05, lw06
+#  -
+#    name: HW - edac status
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
+#    normal_check_interval: 120
     #hostgroups: computers
     #excludehosts: villa, lobos, senfl, schein
   -
@@ -1968,12 +1911,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megaraid"
     hostgroups: megaraid
   ###
-  -
-    name: RAID - MPT
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-mpt"
-    hostgroups: mptraid
-  ###
   -
     name: RAID - DRBD
     servicegroups: raid
@@ -2498,7 +2435,7 @@ services:
   # {{{ openstack
   -
     name: process - openstack - memcached
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nobody -C memcached -a '/usr/bin/memcached -m 64 -p 11211 -u nobody -l 127.0.0.1'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nobody -C memcached -a '/usr/bin/memcached -m 128 -p 11211 -u nobody -l 0.0.0.0'"
     hostgroups: openstack-controller
   -
     name: process - openstack - glance-registry