sibelius does have a pg, and postgres84 hosts often run more than one cluster, such...

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index dfb9c2b..28889d9 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -172,6 +172,10 @@ servers:
     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
@@ -404,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
@@ -670,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
@@ -715,27 +719,36 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers
+    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
@@ -1166,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
 
  ####
   -
@@ -1948,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'"