X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=d5546fef7192a446bb29f54483abdac396ad5975;hb=58ab394e4a428d282cc362ca4b81c8d3768460a6;hp=70a9405d0a6d349433fbe02075cefa0cd6eda83d;hpb=0257cfd83fee325a158a1443044ba0d954ea757d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 70a9405..d5546fe 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -173,7 +173,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts
   raff:
     address: 192.25.206.59
     parents: spohr
@@ -274,7 +274,7 @@ servers:
   byrd:
     address: 82.195.75.101
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, hassrvfs
+    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, postgres84-hosts
 
   master:
     address: 70.103.162.29
@@ -423,11 +423,15 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, ulogd-hosts, lenny, hassrvfs
+    hostgroups: computers, ulogd-hosts, lenny, hassrvfs, hasbootfs
   geo3:
     address: 195.20.242.125
     parents: schumann
     hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
+  soler:
+    address: 195.20.242.126
+    parents: schumann
+    hostgroups: computers, service, lenny, hasbootfs, hassrvfs
 
   caballero:
     address: 193.201.200.200
@@ -475,10 +479,14 @@ servers:
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts
   dijkstra:
     address: 137.82.84.70
     parents: gw-ubc
+    hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts
+  luchesi:
+    address: 137.82.84.78
+    parents: gw-ubc
     hostgroups: computers, bl460, acpid-hosts, lenny
   wolkenstein:
     address: 137.82.84.89
@@ -511,11 +519,11 @@ servers:
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
-    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts
+    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts
   cimarosa:
     address: 137.82.84.80
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client
   paganini:
     address: 137.82.84.82
     parents: gw-ubc
@@ -708,6 +716,9 @@ hostgroups:
   postgres83-hosts:
     alias: hosts running postgres83
     private: 1
+  postgres84-hosts:
+    alias: hosts running postgres84
+    private: 1
   mysql-hosts:
     alias: hosts running mysql
     private: 1
@@ -1736,6 +1747,10 @@ services:
   #  hostgroups: postgres81-hosts
   #  depends: process - postresql81 - master
  ####
+  -
+    name: process - postresql84 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
+    hostgroups: postgres84-hosts
   -
     name: process - postresql83 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
@@ -1774,6 +1789,12 @@ services:
     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, master
 
+  -
+    name: udd stunnel - master cert
+    nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 8080 -S -C 14 -t 45"
+    hosts: samosa
+
+  -
  ####
   #-
   #  name: process - xenconsoled
@@ -1896,6 +1917,22 @@ services:
     name: DNS SOA sync - alioth.debian.org
     check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
     hosts: global
+  -
+    name: DNS SOA sync - 2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
+    check: "dsa_check_soas!2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
+    hosts: global
+  -
+    name: DNS SOA sync - a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
+    check: "dsa_check_soas!a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
+    hosts: global
+  -
+    name: DNS SOA sync - 2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa
+    check: "dsa_check_soas!2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa"
+    hosts: global
+  -
+    name: DNS SOA sync - 2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa
+    check: "dsa_check_soas!2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
+    hosts: global
  ############
   -
     name: ping alive check