X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=7fda455407ba1a8b6c9d01c54256703a3d919621;hb=3522d31197e74bed3de85cd608fe69cfb6c79761;hp=3fc78f65e45a85ad2c840aa89394cfd68695da78;hpb=2cb70780f3f5dc29a6e63f7e41a3281172f94bdc;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 3fc78f6..7fda455 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -84,10 +84,14 @@ servers:
     address: 82.195.75.126
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-marist:
+  gw-marist0:
     address: 148.100.96.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-marist:
+    address: 148.100.88.1
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-osuosl:
     address: 140.211.166.1
     parents: gw-ubcece
@@ -536,6 +540,10 @@ servers:
     address: 82.195.75.107
     parents: ganeti3
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, wheezy
+  stockhausen:
+    address: 82.195.75.108
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, acpid-hosts, jetty-hosts
   ganeti3:
     address: 82.195.75.111
     parents: gw-man-da
@@ -560,8 +568,12 @@ servers:
   # {{{ gw-marist
   zappa:
     address: 148.100.96.103
-    parents: gw-marist
+    parents: gw-marist0
     hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed
+  zani:
+    address: 148.100.88.22
+    parents: gw-marist
+    hostgroups: computers, buildd, hassrvfs, wheezy
   # }}}
   # {{{ gw-osuosl
   busoni:
@@ -608,7 +620,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-rapidswitch
-    hostgroups: computers, buildd, sw-raid, wheezy, hassrvfs
+    hostgroups: computers, buildd, sw-raid, wheezy, hassrvfs, acpid-hosts
   # }}}
   # {{{ gw-sanger
   sibelius:
@@ -1047,6 +1059,9 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
+  jetty-hosts:
+    alias: hosts running jetty
+    private: 1
   varnish-hosts:
     alias: hosts running varnish
     private: 1
@@ -2185,6 +2200,16 @@ services:
     # there is always one extra process per check currently running..
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
     hosts: tchaikovsky
+ ###
+  -
+    name: process - jetty - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -a 'jsvc.exec'"
+    hostgroups: jetty-hosts
+  -
+    name: process - jetty - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u jetty -a 'jsvc.exec -user jetty'"
+    hostgroups: jetty-hosts
+    depends: process - jetty - master
 
  ###
   -