X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=28889d99b493b7b1106988d9f44c043470765431;hb=38423e963b0352afd82162291f9b393d790e2a75;hp=17d366514152c1b49e96762ac178f3520580d64e;hpb=7ef7af171f4e9ea530712779c2d1d79d6b38b386;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 17d3665..28889d9 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -168,6 +168,14 @@ servers:
     address: 86.59.118.145
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-arm:
+    address: 82.44.141.46
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
+  gw-ynic:
+    address: 144.32.168.65
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -400,7 +408,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, megaraid
+    hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
@@ -482,7 +490,7 @@ servers:
   spontini:
     address: 206.12.19.14
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
@@ -546,7 +554,7 @@ servers:
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -666,11 +674,11 @@ servers:
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, buildd
   krenek:
     address: 194.177.211.207
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, buildd
   scelsi:
     address: 194.177.211.208
     parents: gw-grnet
@@ -708,6 +716,39 @@ servers:
     hostgroups: computers, acpid-hosts
     # which raid?
 
+  abel:
+    address: 217.140.96.56
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox
+  arnold:
+    address: 217.140.96.57
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
+  alain:
+    address: 217.140.96.58
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
+  alwyn:
+    address: 217.140.96.59
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
+  antheil:
+    address: 217.140.96.60
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
+  arne:
+    address: 217.140.96.61
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs
+
+  poulenc:
+    address: 144.32.168.77
+    parents: gw-ynic
+    hostgroups: computers, buildd, sw-raid, hassrvfs
+  porpora:
+    address: 144.32.168.78
+    parents: gw-ynic
+    hostgroups: computers, buildd, sw-raid, hassrvfs
 
 #############################
 # host groups
@@ -1138,6 +1179,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
     hostgroups: computers
     excludehostgroups: freebsd
+  -
+    name: puppetized firewall
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf"
+    hostgroups: computers
+    excludehostgroups: freebsd
 
  ####
   -
@@ -1820,7 +1866,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg
+    hosts: ries, franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg, vivaldi
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1834,7 +1880,8 @@ services:
     # merkel2		nm.debian.org
     # liszt		lists.debian.org
     # grieg		buildd.debian.org
-    hosts: ries, franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg
+    # vivaldi		fossology.debian.org
+    hosts: ries, franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg, vivaldi
     depends: network service - https
     normal_check_interval: 60
 
@@ -1919,9 +1966,8 @@ services:
  ####
   -
     name: process - postresql84 - 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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
     hostgroups: postgres84-hosts
-    excludehosts: franck
   -
     name: process - postresql83 - 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/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"