X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=a3a0a630b11d49e304fec7365e9778de18ed121f;hb=1f3669290d89e34640a423194b679b8343b822b6;hp=dff176f082f38c55a6e2850cc15d7743588f2efc;hpb=8a64ab95c07b6aae1a5e84105376bc3f1eb9afba;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index dff176f..a3a0a63 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -408,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
@@ -583,6 +583,18 @@ servers:
     address: 206.12.19.15
     parents: tchaikovsky
     hostgroups: computers, buildd
+  rossini:
+    address: 206.12.19.19
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts
+  salieri:
+    address: 206.12.19.20
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts
+  traetta:
+    address: 206.12.19.21
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -674,11 +686,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
@@ -719,23 +731,23 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   arne:
     address: 217.140.96.61
     parents: gw-arm
@@ -744,12 +756,11 @@ servers:
   poulenc:
     address: 144.32.168.77
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid
-
+    hostgroups: computers, buildd, sw-raid, hassrvfs
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, hassrvfs
 
 #############################
 # host groups
@@ -810,6 +821,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  dl585:
+    alias: HP DL385 hosts
+    private: 1
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
@@ -1180,6 +1194,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
 
  ####
   -
@@ -1668,12 +1687,12 @@ services:
     name: process - cpqarrayd
     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
+    hostgroups: dl385, dl380, dl360, bl460, dl585
   -
     name: RAID - arrayprobe
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: franck
   -
     name: RAID - arrayprobe
@@ -1685,13 +1704,13 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
  ###
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: villa, lobos, liszt, senfl, schein, rore
   -
     name: HW - hpasmcli status
@@ -1962,9 +1981,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'"