X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=1c81d2ada470023f182402b164555310ace3e845;hb=9df1ff40470d7e2ca329981cb27b822f5b8c88cc;hp=30357195b206140238252f040842f34f95cc336a;hpb=f9bd9ee6df0c520967d57ef2f07bf1cac00e8b25;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 3035719..1c81d2a 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -282,10 +282,14 @@ servers:
     address: 82.195.75.107
     parents: unger
     hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
+  diamond:
+    address: 82.195.75.108
+    parents: unger
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, bind9-hosts
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, squeeze
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
@@ -535,7 +539,7 @@ servers:
   duarte:
     address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze, nfs-server
   valente:
     address: 206.12.19.112
     parents: dijkstra
@@ -547,7 +551,7 @@ servers:
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
+    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
@@ -632,6 +636,10 @@ servers:
     address: 206.12.19.125
     parents: luchesi
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts
+  glinka:
+    address: 206.12.19.126
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -694,7 +702,7 @@ servers:
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https, lenny
+    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https, squeeze
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
@@ -1905,6 +1913,12 @@ services:
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -h ldap:/// ldaps:/// -g openldap -u openldap'"
     hosts: draghi
+  -
+    name: network service - ldaps cert
+    check: dsa_check_cert!636
+    depends: process - slapd
+    normal_check_interval: 60
+    hosts: draghi
  ###
   -
     name: process - ulogd