alain, alwyn, antheil, arna are buildds

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9e70c6e..c220731 100644 (file)
--- 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
@@ -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
@@ -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
@@ -1085,6 +1126,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 ############
  ####
@@ -1133,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
 
  ####
   -
@@ -1815,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
   -
@@ -1829,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