X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=9a143f25b2977b0c243b5bbea7376a5246406181;hb=41304cb9586e5ee7d1e67fc2e5619548aa8ae94e;hp=cc8302a89ad5f86c731014231ebdbd08a082a732;hpb=538fd733f25f0dd7d42f671b2673c498f4f6f0a3;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index cc8302a..9a143f2 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -126,7 +126,7 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-ubc:
-    address: 137.82.84.41
+    address: 137.82.84.94
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: lfilipoz
@@ -163,7 +163,7 @@ servers:
   raff:
     address: 192.25.206.59
     parents: samosa
-    hostgroups: computers, no-udev, service, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client
   gluck:
     address: 192.25.206.10
     parents: samosa
@@ -171,7 +171,7 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts
+    hostgroups: computers, general, apache1-hosts, apache2-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts
   spohr:
     address: 192.25.206.33
     parents: samosa
@@ -425,12 +425,12 @@ servers:
     hostgroups: deadslow
 
   spontini:
-    address: 137.82.84.42
+    address: 137.82.84.65
     parents: gw-ubc
     hostgroups: computers, buildd
     contacts: lfilipoz
   ravel:
-    address: 137.82.84.43
+    address: 137.82.84.66
     parents: gw-ubc
     hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts
 
@@ -451,7 +451,7 @@ servers:
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts
+    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts
     contacts: holger
 
   rem:
@@ -1490,7 +1490,7 @@ services:
     name: network service - http keyserver
     check: dsa_check_http_port!11371
     hosts: raff
-    depends: process - apache - master
+    depends: process - apache2 - master
 
   -
     name: network service - https
@@ -1605,6 +1605,16 @@ services:
     hostgroups: mysql-hosts
     depends: process - mysql - master
 
+ ####
+  -
+    name: process - stunnel4 - postgres-udd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
+    hosts: piatti
+  -
+    name: process - stunnel4 - postgres-udd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd.conf'"
+    hosts: merkel
+
  ####
   #-
   #  name: process - xenconsoled