X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=4bb8414af311dbcc7b209fbe9e01eb4248024d7b;hb=8335c03579a890f69fb8c85126f2fd36ece06548;hp=9584251f07df13e225306f52e17daa4dc98cfc27;hpb=e1cf8a0d1daec0d1f60ae032eff9d546dc82f6a7;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9584251..4bb8414 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -31,9 +31,9 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contacts: joerg
-  gw-1und1-sec:
-    address: 212.227.126.33
-    parents: gw-ubcece
+#  gw-1und1-sec:
+#    address: 212.227.126.33
+#    parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-accumu:
     address: 130.239.18.97
@@ -177,7 +177,8 @@ servers:
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
-    parents: gw-1und1-sec
+    parents: gw-ubcece
+    #parents: gw-1und1-sec
     hostgroups: computers, acpid-hosts, service, squeeze
   chopin:
     address: 195.20.242.124
@@ -190,10 +191,11 @@ servers:
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze, apache-https
   wieck:
     address: 195.20.242.89
-    parents: gw-1und1-sec
+    parents: gw-ubcece
+    #parents: gw-1und1-sec
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror, hasvarlogfs
   # }}}
   # {{{ gw-accumu
@@ -210,35 +212,31 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze, deadslow
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, squeeze, deadslow
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox
-  hartmann:
-    address: 217.140.96.67
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, deadslow
   hasse:
     address: 217.140.96.68
     parents: gw-arm
@@ -254,7 +252,7 @@ servers:
   # }}}
   # {{{ gw-brainfood
   master:
-    address: 70.103.162.29
+    address: 97.107.116.29
     parents: gw-brainfood
     hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze
   murphy:
@@ -319,7 +317,7 @@ servers:
   argento:
     address: 93.94.130.160
     parents: gw-dgi
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, sw-raid, hassrvfs, wheezy
     contacts: bzed
   widor:
     address: 93.94.130.161
@@ -340,11 +338,6 @@ servers:
     address: 192.25.206.62
     parents: gw-ftcollins
     hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
-  penalosa:
-    address: 192.25.206.68
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, hasbootfs, lenny
-    contacts: dannf
   samosa:
     address: 192.25.206.57
     parents: gw-ftcollins
@@ -378,11 +371,6 @@ servers:
     parents: rautavaara
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
     #, mptraid
-  field:
-    address: 194.177.211.210
-    parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
-    #, mptraid
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
@@ -403,10 +391,6 @@ servers:
     address: 194.177.211.199
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, megaraid, service, squeeze
-  scelsi:
-    address: 194.177.211.208
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, service, squeeze
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
@@ -462,7 +446,7 @@ servers:
   new-master:
     address: 82.195.75.110
     parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, bacula-client
   fils:
     address: 82.195.75.89
     parents: czerny
@@ -470,7 +454,7 @@ servers:
   vento:
     address: 82.195.75.98
     parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, heavy-exim
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, heavy-exim
   lully:
     address: 82.195.75.99
     parents: czerny
@@ -503,6 +487,15 @@ servers:
     address: 82.195.75.107
     parents: unger
     hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
+  ganeti3:
+    address: 82.195.75.111
+    parents: gw-man-da
+    hostgroups: notacomputer
+  wilder:
+    address: 82.195.75.112
+    parents: ganeti3
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https
+
 #  lamb:
 #    address: 82.195.75.101
 #    parents: unger
@@ -518,7 +511,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze, hasvarlogfs
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, heavy-exim, squeeze, hasvarlogfs
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
@@ -608,7 +601,7 @@ servers:
   lindberg:
     address: 86.59.118.149
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, megactl
+    hostgroups: computers, acpid-hosts, service, squeeze, megactl
     # which raid?
   merikanto:
     address: 86.59.118.147
@@ -833,7 +826,7 @@ servers:
   bizet:
     address: 206.12.19.137
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, uploadqueue
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
   lilburn:
     address: 206.12.19.138
     parents: dijkstra
@@ -857,7 +850,16 @@ servers:
   menotti:
     address: 206.12.19.143
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs, apache2-hosts
+    #, apache-https
+  coincy:
+    address: 206.12.19.144
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs
+  stanley:
+    address: 206.12.19.145
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
   # }}}
   # {{{ gw-ugent
   ancina:
@@ -873,22 +875,6 @@ servers:
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-utwente
-  kassia:
-    address: 130.89.149.224
-    parents: gw-utwente
-    hostgroups: computers, service, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
-  kassia-sec:
-    address: 130.89.149.225
-    parents: kassia
-    hostgroups: secondary-IPs
-  kassia-ftp:
-    address: 130.89.149.226
-    parents: kassia
-    hostgroups: secondary-IPs
-  kassia-volatile:
-    address: 130.89.149.227
-    parents: kassia
-    hostgroups: secondary-IPs
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
@@ -1023,9 +1009,6 @@ hostgroups:
   wheezy:
     alias: Hosts running wheezy
 
-  lenny:
-    alias: Hosts running lenny
-
   kvmdomains:
     alias: Hosts that are KVM domains
     private: 1
@@ -1096,6 +1079,10 @@ hostgroups:
   apache-https:
     alias: hosts with https services
     private: 1
+  
+  bacula-client:
+    alias: hosts which are backuped with bacula
+    private: 1
 
   nfs-client:
     alias: hosts mounting filesystems using NFS
@@ -1241,12 +1228,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: kassia, spohr
+    excludehosts: spohr
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: kassia, spohr
+    hosts: spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1267,12 +1254,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
-    excludehosts: ries, beach
+    excludehosts: stabile, beach
   -
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts: ries, beach
+    hosts: stabile, beach
   -
     name: disk usage on /tmp
     servicegroups: diskspace
@@ -1297,7 +1284,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: samosa, stabile, sibelius, busoni, buxtehude
+    hosts: stabile, sibelius, busoni, buxtehude
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1395,7 +1382,11 @@ services:
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
-
+  -
+    name: backup - bacula
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula -H $HOSTNAME$"
+    runfrom: dinis
+    hostgroups: bacula-client
  ####
   -
     name: running kernel
@@ -1564,7 +1555,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: armhf
+    hostgroups: wheezy
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1601,7 +1592,7 @@ services:
  ###
   -
     name: process - cron
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C cron -a /usr/sbin/cron"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C cron -a /usr/sbin/cron"
     hostgroups: computers
 
  ###
@@ -1738,6 +1729,12 @@ services:
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C 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: wheezy
+  -
+    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: squeeze
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
@@ -1883,6 +1880,13 @@ services:
     hostgroups: computers
     excludehosts: vasks, wagner
     excludehostgroups: freebsd
+  -
+    name: system - filesystem check
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
+    normal_check_interval:  60
+    retry_check_interval: 15
+    excludehosts: wagner, vasks
+    hostgroups: computers
  ###
   -
     name: local resolver
@@ -1984,7 +1988,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: armhf
+    hostgroups: wheezy
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -2002,7 +2006,13 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
-    excludehosts: kassia
+    excludehosts: schein
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
+    normal_check_interval: 120
+    hosts: schein
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2015,12 +2025,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
     normal_check_interval: 120
     hostgroups: dl585
-  -
-    name: HW - hpacucli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:2 --ignore-transfer-speed=1I:1:3 --ignore-transfer-speed=1I:1:4 --ignore-transfer-speed=2I:1:5 --ignore-transfer-speed=2I:1:6"
-    normal_check_interval: 120
-    hosts: kassia
  ###
   -
     name: HW - hpasmcli status
@@ -2168,22 +2172,12 @@ services:
     check: check_tcp!873
     hosts: merikanto2
     depends: merikanto:process - xinetd
-  #-
-  #  name: network service - rsync
-  #  check: check_tcp!873
-  #  hosts: kassia-sec
-  #  depends: kassia:process - xinetd
-#  -
-#    name: network service - rsync
-#    check: check_tcp!873
-#    hosts: merikanto2
-#    depends: merikanto:process - xinetd
 
  ###
   -
-    name: process - nagios3
+    name: process - icinga
     # there is always one extra process per check currently running..
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C nagios3 -a '/usr/sbin/nagios3 -d /etc/nagios3/nagios.cfg'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
     hosts: tchaikovsky
 
  ###
@@ -2279,11 +2273,15 @@ services:
     depends: klecker:process - xinetd
 
  ####
+  #-
+  #  name: process - debianqueued
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued"
   -
     name: process - debianqueued
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak-unpriv -C debianqueued"
     hostgroups: uploadqueue
 
+
  ###
   #-
   #  name: process - postresql81 - master
@@ -2326,15 +2324,6 @@ services:
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
     hosts: beethoven
- ####
-  -
-    name: process - stunnel4 - postgres-udd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
-    hosts: samosa
-  -
-    name: udd stunnel - master cert
-    nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 8080 -S -C 14 -t 45"
-    hosts: samosa
  ####
  ####
   -
@@ -2395,14 +2384,14 @@ services:
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
-    hosts: fano, fasch, field, finzi, fils
+    hosts: fano, fasch, finzi, fils
     contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    excludehosts: fano, fasch, field, finzi, fils
+    excludehosts: fano, fasch, finzi, fils
     contact_groups: buildd
  ####
   -