X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=db429302f2c35406969a8e3a48671998672e25a3;hb=5c9e4d46059f366266fb00332918b27bf5de6d56;hp=9a0b0129b99af6d49b76ae1e1eb68b200c329b82;hpb=b26fb4292c058030edb881bfcae4e16c0aa891f6;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9a0b012..db42930 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -168,6 +168,10 @@ 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
 
   global:
     hostgroups: notacomputer
@@ -546,7 +550,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
@@ -708,6 +712,30 @@ servers:
     hostgroups: computers, acpid-hosts
     # which raid?
 
+  abel:
+    address: 217.140.96.56
+    parents: gw-arm
+    hostgroups: computers
+  arnold:
+    address: 217.140.96.57
+    parents: gw-arm
+    hostgroups: computers
+  alain:
+    address: 217.140.96.58
+    parents: gw-arm
+    hostgroups: computers
+  alwyn:
+    address: 217.140.96.59
+    parents: gw-arm
+    hostgroups: computers
+  antheil:
+    address: 217.140.96.60
+    parents: gw-arm
+    hostgroups: computers
+  arne:
+    address: 217.140.96.61
+    parents: gw-arm
+    hostgroups: computers
 
 #############################
 # host groups
@@ -1085,6 +1113,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cde"
     hosts: sibelius
+  -
+    name: disk usage on /srv/fossology.debian.net
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/fossology.debian.net"
+    hosts: vivaldi
 
  ############ All Computers ############
  ####
@@ -1815,7 +1848,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
   -
@@ -1829,7 +1862,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