X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=0b6fe04870a8a8221639456cc65e8656c191d3e7;hb=327c5dd675b80f2231d5c3d05333f2d7ae917f61;hp=f4a7ccba68e6f7dbad7247c5591dbc6620d7b53b;hpb=eb8572a492f41d50acf18288987271852616ed4b;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index f4a7ccb..0b6fe04 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -153,7 +153,11 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-isc:
-    address: 149.20.20.1 
+    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
 
@@ -248,6 +252,11 @@ servers:
     parents: unger
     hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs, puppet
 
+  geo1:
+    address: 82.195.75.105
+    parents: unger
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, puppet
+
   master:
     address: 70.103.162.29
     parents: gw-brainfood
@@ -385,6 +394,10 @@ servers:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny, puppet
+  chopin:
+    address: 195.20.242.124
+    parents: schumann
+    hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts
 
   caballero:
     address: 193.201.200.200
@@ -452,11 +465,15 @@ servers:
     address: 137.82.84.66
     parents: gw-ubc
     hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, puppet
+  dijkstra:
+    address: 137.82.84.70
+    parents: gw-ubc
+    hostgroups: computers, bl460, rsyslog-hosts, acpid-hosts, lenny, puppet
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts, puppet
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
@@ -470,7 +487,7 @@ servers:
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs
+    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs, puppet
     contacts: holger
 
   rem:
@@ -502,6 +519,11 @@ servers:
     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, rsyslog-hosts, lenny, puppet
+
 #############################
 # host groups
 #
@@ -559,6 +581,9 @@ hostgroups:
   dl360:
     alias: HP DL360 hosts
     private: 1
+  bl460:
+    alias: HP BL460 blades
+    private: 1
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
@@ -724,12 +749,12 @@ services:
     name: disk usage on /var
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, tartini, morales, powell, escher
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, tartini, morales, powell, escher
   -
     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, schein
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -739,7 +764,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
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka, chopin
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -759,7 +784,7 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, voltaire, lebrun, rem, ball, paer, escher
+    hosts: raptor, voltaire, rem, ball, paer, escher
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -1382,18 +1407,18 @@ 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
+    hostgroups: dl385, dl380, dl360, bl460
   -
     name: RAID - arrayprobe
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
-    hostgroups: dl385, dl380, dl360
+    hostgroups: dl385, dl380, dl360, bl460
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360
+    hostgroups: dl385, dl380, dl360, bl460
  ###
   -
     name: RAID - areca
@@ -1546,13 +1571,13 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: samosa, ries
+    hosts: samosa, ries, klecker
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: samosa, ries
+    hosts: samosa, ries, klecker
     depends: network service - https
     normal_check_interval: 60
  ####