X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=5b3eb09abe3321aa956c72d2ee8bc0e798ee11c4;hb=c8b9d17ed355b826cc191d822e8d5f7da86d8d1f;hp=7fbdcfbfcfd2d96061e73c5e5467c8151b2de73e;hpb=668822367b85cce58d75d45742165638864516b9;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 7fbdcfb..5b3eb09 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -10,7 +10,6 @@
 #  - *: check munin stats collection works
 #  - *: check backups are successful
 #  - *: unwanted: network: auth, discard, daytime, time (on some), cvs-pserver, rsync (on some), ftp (on some), http (on some)
-#  - goetz: gmond/gmetad
 #  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
 
@@ -153,6 +152,14 @@ servers:
     address: 213.188.99.215
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-isc:
+    address: 149.20.20.1
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-aca:
+    address: 130.239.18.97
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -161,7 +168,7 @@ servers:
 
   samosa:
     address: 192.25.206.57
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, puppet
   raff:
     address: 192.25.206.59
     parents: samosa
@@ -181,30 +188,30 @@ servers:
   peri:
     address: 192.25.206.15
     parents: samosa
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, puppet
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: samosa
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, puppet
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: samosa
-    hostgroups: computers, no-udev, buildd
+    hostgroups: computers, buildd, lenny, puppet
   paer:
     address: 192.25.206.11
     parents: samosa
-    hostgroups: computers, porterbox, lenny, hasbootfs
+    hostgroups: computers, porterbox, lenny, hasbootfs, puppet
   merulo:
     address: 192.25.206.58
     parents: samosa
-    hostgroups: computers, no-udev, porterbox
+    hostgroups: computers, porterbox, lenny, puppet
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, lenny
+    hostgroups: computers, service, dl385, bind9-hosts, lenny, puppet
     contacts: joerg, bzed
   morales:
     address: 82.195.75.97
@@ -219,12 +226,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, puppet
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -239,7 +246,7 @@ servers:
   unger:
     address: 82.195.75.102
     parents: gw-man-da
-    hostgroups: computers, service, dl360, rsyslog-hosts, acpid-hosts, lenny
+    hostgroups: computers, service, dl360, rsyslog-hosts, acpid-hosts, lenny, puppet
   handel:
     address: 82.195.75.104
     parents: unger
@@ -248,11 +255,11 @@ servers:
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload, lenny
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload, lenny, puppet
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, postfix-hosts, dl380, acpid-hosts, lenny
+    hostgroups: computers, general, postfix-hosts, dl380, acpid-hosts, lenny, puppet
 
   ries:
     address: 128.148.34.103
@@ -270,7 +277,7 @@ servers:
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, lenny, puppet, smart
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -283,37 +290,37 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
 
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, lenny, puppet
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts, no-samhain
+    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts, puppet
 
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim, lenny, puppet
 
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
 
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet
     contacts: bzed
-  
+
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
@@ -323,7 +330,7 @@ servers:
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, no-udev, porterbox, sw-raid
+    hostgroups: computers, porterbox, sw-raid, lenny, puppet
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
@@ -332,24 +339,24 @@ servers:
   raptor:
     address: 195.243.109.162
     parents: gw-topalis
-    hostgroups: computers, porterbox, postfix-hosts
+    hostgroups: computers, porterbox, postfix-hosts, lenny
 
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny puppet
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny, puppet
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, puppet
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, lenny
+    hostgroups: computers, porterbox, sw-raid, lenny, puppet
     contacts: tjrc1
 
   verdi:
@@ -360,7 +367,7 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, puppet, lenny
     contacts: sfrost
 
   puccini:
@@ -371,17 +378,17 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny
+    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, puppet
     contacts: joerg
 
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny
+    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny, puppet
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny, puppet
 
   caballero:
     address: 193.201.200.200
@@ -410,12 +417,12 @@ servers:
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, single-cpu, smart
+    hostgroups: computers, porterbox, single-cpu, smart, lenny, puppet
 
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny
+    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny, puppet
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -432,7 +439,7 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet
     contacts: luk
 
   agnesi:
@@ -448,7 +455,7 @@ servers:
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, puppet
 
   lebrun:
     address: 193.198.184.10
@@ -457,7 +464,7 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, puppet
 
   tartini:
     address: 82.94.249.158
@@ -473,17 +480,17 @@ servers:
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, lenny, puppet
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, puppet
 
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, lenny
+    hostgroups: computers, porterbox, lenny, puppet
 
   escher:
     address: 213.188.99.215
@@ -492,7 +499,17 @@ servers:
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny
+    hostgroups: computers, single-cpu, hasbootfs, lenny, puppet
+
+  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
+
+  praetorius:
+    address: 130.239.18.121
+    parents: gw-aca
+    hostgroups: computers, buildd, lenny, puppet
 
 #############################
 # host groups
@@ -701,12 +718,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: ries
+    excludehosts: ries, klecker
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
-    hosts: ries
+    hosts: ries, klecker
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -721,7 +738,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -832,11 +849,11 @@ services:
   -
     name: samhain
     servicegroups: samhain
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-samhain -t 45"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
     hostgroups: computers
     excludehostgroups: no-samhain
     depends: process - samhain
-    normal_check_interval: 240
+    normal_check_interval: 60
     retry_check_interval: 5
 
  ####
@@ -922,32 +939,32 @@ services:
     hostgroups: computers, deadslow
     excludehosts: agnesi, crest, kullervo
     excludehostgroups: lenny
-    normal_check_interval:  360
+    normal_check_interval:  60
   -
     name: "network service - sshd - version"
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2+m68k1"
     depends: network service - sshd
     hosts: crest, kullervo
-    normal_check_interval:  360
+    normal_check_interval:  60
   -
     name: "network service - sshd - version"
     check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
     depends: network service - sshd
     hostgroups: lenny
-    normal_check_interval:  360
+    normal_check_interval:  60
   -
     name: "network service - sshd - version - 2260"
     check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch3"
     depends: network service - sshd - 2260
     hosts: agnesi
-    normal_check_interval:  360
+    normal_check_interval:  60
  #
   -
     name: ssh - weak keys
     servicegroups: weaksshkeys
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys"
     hostgroups: computers
-    normal_check_interval:  360
+    normal_check_interval:  60
  ####
   -
     name: network service - nrpe
@@ -1546,7 +1563,7 @@ services:
     check: dsa_check_cert!443
     hosts: samosa, ries
     depends: network service - https
-    normal_check_interval: 240
+    normal_check_interval: 60
  ####
   -
     name: process - named