X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=6ae31c5b565d860fcd7b5f0b05ef171e8e05fead;hb=160d04a24e2afb4f27c12546bb50e6c6ea00c5cc;hp=585386c8a823ad3794eb4ebc4ef36cbc4c33d109;hpb=2455c4d6396868fbb4b25d990d1cc8bee18dbe4c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 585386c..6ae31c5 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -72,10 +72,6 @@ servers:
     address: 62.104.23.249
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
-  gw-topalis:
-    address: 195.243.109.254
-    parents: gw-HP-ftc
-    hostgroups: routing-infrastructure
   gw-sanger:
     address: 193.62.202.18
     parents: gw-HP-ftc
@@ -160,6 +156,10 @@ servers:
     address: 130.239.18.97
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-esiee:
+    address: 147.215.2.249
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -168,6 +168,7 @@ servers:
 
   samosa:
     address: 192.25.206.57
+    parents: spohr
     hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, puppet
   raff:
     address: 192.25.206.59
@@ -183,10 +184,9 @@ servers:
     hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
   spohr:
     address: 192.25.206.33
-    parents: spohr
     hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, puppet
   spohr2:
-    address: 140.211.166.38
+    address: 192.25.206.38
     parents: rietz
     hostgroups: secondary-IPs
   peri:
@@ -220,7 +220,7 @@ servers:
   morales:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs
+    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs
     contacts: bzed
   sperger:
     address: 82.195.75.98
@@ -230,12 +230,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, puppet
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, puppet, hassrvfs
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet, hassrvfs
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -313,6 +313,14 @@ servers:
     address: 128.31.0.46
     parents: gw-mit-csail
     hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts, puppet
+  rore:
+    address: 128.31.0.49
+    parents: gw-mit-csail
+    hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl360, acpid-hosts
+  carver:
+    address: 128.31.0.50
+    parents: gw-mit-csail
+    hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl380, acpid-hosts, hassrvfs, ulogd-hosts
 
   klecker:
     address: 194.109.137.218
@@ -327,7 +335,7 @@ servers:
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet, hassrvfs
     contacts: bzed
 
   widor:
@@ -341,11 +349,6 @@ servers:
     parents: gw-freenet
     hostgroups: computers, porterbox, sw-raid, lenny, puppet
 
-  raptor:
-    address: 195.243.109.162
-    parents: gw-topalis
-    hostgroups: computers, porterbox, postfix-hosts, lenny
-
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
@@ -378,12 +381,12 @@ servers:
   puccini:
     address: 87.106.4.56
     parents: gw-1und1
-    hostgroups: computers, buildd, lenny, rsyslog-hosts, ulogd-hosts, puppet
+    hostgroups: computers, buildd, lenny, rsyslog-hosts, ulogd-hosts, puppet, hassrvfs
     contacts: joerg
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, puppet
+    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, puppet, hassrvfs
     contacts: joerg
 
   schumann:
@@ -397,7 +400,11 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts
+    hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts, hassrvfs
+  geo3:
+    address: 195.20.242.125
+    parents: schumann
+    hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts, single-cpu
 
   caballero:
     address: 193.201.200.200
@@ -448,7 +455,7 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet, hassrvfs
     contacts: luk
 
   agnesi:
@@ -469,6 +476,14 @@ servers:
     address: 137.82.84.70
     parents: gw-ubc
     hostgroups: computers, bl460, rsyslog-hosts, acpid-hosts, lenny, puppet
+  brahms:
+    address: 137.82.84.74
+    parents: dijkstra
+    hostgroups: computers, lenny, puppet, buildd, hasbootfs, hassrvfs
+  geo2:
+    address: 137.82.84.71
+    parents: dijkstra
+    hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts, single-cpu
 
   lebrun:
     address: 193.198.184.10
@@ -482,7 +497,7 @@ servers:
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs
 
   piatti:
     address: 193.167.161.225
@@ -503,7 +518,7 @@ servers:
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, lenny, puppet
+    hostgroups: computers, porterbox, lenny, puppet, hassrvfs
 
   escher:
     address: 213.188.99.215
@@ -517,13 +532,18 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360, bind9-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
     hostgroups: computers, buildd, rsyslog-hosts, lenny, puppet
 
+  lafayette:
+    address: 147.215.7.160
+    parents: gw-esiee
+    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs
+
 #############################
 # host groups
 #
@@ -675,6 +695,9 @@ hostgroups:
   hasbootfs:
     alias: hosts with a /boot
     private: 1
+  hassrvfs:
+    alias: hosts with a /srv
+    private: 1
 
 
 #############################
@@ -764,7 +787,7 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka, chopin
+    hostgroups: hassrvfs
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -784,17 +807,12 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, voltaire, rem, ball, paer, escher
+    hosts: voltaire, rem, ball, paer, escher
   -
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /home"
     hosts: gluck
-  -
-    name: disk usage on /chroot
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /chroot"
-    hosts: raptor
   -
     name: disk usage on /mnt/hdc
     servicegroups: diskspace
@@ -1012,18 +1030,18 @@ services:
     # etch: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ntp -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
-    excludehosts: raptor, zelenka
+    excludehosts: zelenka
   -
     name: network service - ntp
-    check: check_ntp
+    check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: raptor, allegri, zelenka
+    excludehosts: allegri, zelenka
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: raptor, allegri, zelenka
+    hosts: allegri, zelenka
     depends: process - xinetd
 
  ###
@@ -1292,14 +1310,20 @@ services:
     check: dsa_check_smtp
     hostgroups: computers
     excludehostgroups: postfix-hosts
+    excludehosts: lafayette
     depends: process - exim
 
   -
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi, kassia, allegri, raptor, piatti
+    excludehosts: verdi, kassia, allegri, piatti
     depends: process - postfix - master
+  -
+    name: network service - submission
+    check: dsa_check_smtp_port!587
+    hosts: lafayette
+    depends: process - exim
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
@@ -1310,13 +1334,6 @@ services:
     check: dsa_check_smtp_port!8080
     hosts: murphy
     depends: process - postfix - master
-  -
-    name: network service - smtp - port 2025
-    remotecheck: /usr/lib/nagios/plugins/check_smtp -t 40 -H $HOSTADDRESS$ -p 2025
-    runfrom: murphy
-    hosts: raptor
-    depends: process - postfix - master
-
   -
     name: network service local - smtps cert
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
@@ -1403,6 +1420,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-sw"
     hostgroups: sw-raid
 
+ ###
+  -
+    name: process - monit
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+    hostgroups: lenny
+    excludehostgroups: deadslow
  ###
   -
     name: process - cpqarrayd
@@ -1485,13 +1508,13 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, raptor, allegri, gluck, zelenka
+    hosts: samosa, allegri, gluck, zelenka
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, raptor, allegri, gluck, zelenka
+    excludehosts: samosa, allegri, gluck, zelenka
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1726,12 +1749,6 @@ services:
     hostgroups: buildd
     contacts: luk
 
- ###
-  -
-    name: process - iscsid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 1: -u root -C iscsid '/usr/sbin/iscsid'"
-    hosts: raptor
-
  ###
   #-
   #  name: process - tftpd