X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=eb516d2d7abbd70c920ed340d6d906b02888631c;hb=7c19e09fa035912903382ff421f59433e2ab3b58;hp=7b2eb4de77992cb4c427121d6e369b4bf0089465;hpb=43972d48a875819dd3d85a5f98057942883cf2b7;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 7b2eb4d..eb516d2 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -190,7 +190,7 @@ servers:
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
   merkel:
     address: 192.25.206.16
     parents: gw-HP-ftc
@@ -202,7 +202,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, nfs-server, spamd, heavy-exim, bind9-hosts, apache-https
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, bind9-hosts, squeeze
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -230,11 +230,6 @@ servers:
     parents: gw-HP-ftc
     hostgroups: computers, buildd, acpid-hosts
 
-  bartok:
-    address: 82.195.75.91
-    parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs
-    contacts: joerg, bzed
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
@@ -259,6 +254,10 @@ servers:
     address: 82.195.75.98
     parents: gw-man-da
     hostgroups: computers, acpid-hosts, service
+  nielsen:
+    address: 82.195.75.99
+    parents: gw-man-da
+    hostgroups: computers, acpid-hosts, service, apache2-hosts
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -286,7 +285,7 @@ servers:
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay
+    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts
   byrd:
     address: 82.195.75.92
     parents: unger
@@ -379,7 +378,7 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, spamd, heavy-exim, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts
 
   saens:
     address: 128.101.240.212
@@ -418,7 +417,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts, service, apache2-hosts
+    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -449,7 +448,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, postgres83-hosts, apache-https
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, postgres84-hosts, apache-https
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -548,11 +547,7 @@ servers:
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service, nfs-server
-  cimarosa:
-    address: 206.12.19.8
-    parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, service
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
@@ -596,7 +591,7 @@ servers:
   rossini:
     address: 206.12.19.19
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
   salieri:
     address: 206.12.19.20
     parents: tchaikovsky
@@ -629,6 +624,10 @@ servers:
     address: 206.12.19.124
     parents: salieri
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, heavy-exim
+  danzi:
+    address: 206.12.19.125
+    parents: luchesi
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -651,8 +650,8 @@ servers:
     contacts: holger
 
   rem:
-    address: 195.71.99.217
-    parents: gw-telefonica
+    address: 82.195.75.68
+    parents: gw-man-da
     hostgroups: computers, buildd, hasbootfs, hashomefs
 
   zelenka:
@@ -728,7 +727,7 @@ servers:
   scelsi:
     address: 194.177.211.208
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, service
+    hostgroups: computers, acpid-hosts, mptraid, service, squeeze
   orff:
     address: 194.177.211.209
     parents: gw-grnet
@@ -754,7 +753,7 @@ servers:
   englund:
     address: 86.59.118.148
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service
+    hostgroups: computers, acpid-hosts, service, apache2-hosts
     # which raid?
   lindberg:
     address: 86.59.118.149
@@ -785,7 +784,7 @@ servers:
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, squeeze
 
   poulenc:
     address: 144.32.168.77
@@ -924,6 +923,9 @@ hostgroups:
   postgres84-hosts:
     alias: hosts running postgres84
     private: 1
+  postgres90-hosts:
+    alias: hosts running postgres90
+    private: 1
   mysql-hosts:
     alias: hosts running mysql
     private: 1
@@ -1056,12 +1058,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: klecker, kassia, spohr
+    excludehosts: klecker, kassia, spohr, liszt
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: klecker, kassia, spohr
+    hosts: klecker, kassia, spohr, liszt
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1081,7 +1083,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
-    hosts: merkel, bartok
+    hosts: merkel
   -
     name: disk usage on /srv
     servicegroups: diskspace
@@ -1193,7 +1195,7 @@ services:
   -
     name: disk usage on /vicepa
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /vicepa"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
     hostgroups: hasvicepa
 
  ############ All Computers ############
@@ -1203,7 +1205,6 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    excludehostgroups: squeeze
     normal_check_interval:  60
     retry_check_interval: 15
  ####
@@ -1466,6 +1467,10 @@ services:
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
     hosts: master, busoni, merkel, quantz
+  -
+    name: mail queue
+    nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
+    hostgroups: heavy-exim
  ###
   -
     name: process - clamav - clamd
@@ -1770,6 +1775,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
     hostgroups: dl385, dl380, dl360, bl460, dl585
+    excludehostgroups: squeeze
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -2074,7 +2080,11 @@ services:
     name: unwanted process - postresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres84-hosts, postgres83-hosts
+    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres83-hosts
+  -
+    name: process - postresql90 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.0/bin/postgres'"
+    hostgroups: postgres90-hosts
   -
     name: process - postresql84 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
@@ -2087,14 +2097,14 @@ services:
   #  name: process - postresql83 - master udd
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
   #  hosts: piatti
-  -
-    name: process - postresql83 - dak master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
-    hosts: chopin
+  #-
+  #  name: process - postresql83 - dak master
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
+  #  hosts: chopin
   -
     name: process - postresql84 - dak master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
-    hosts: franck
+    hosts: franck, chopin
   -
     name: process - postresql84 - dak-dev master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"