X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=356b0bfe86bd1947d2b0f4534ca02b86fa36d713;hb=a03bf94cbc21a91d8d395621248ba8f8cee7fcf8;hp=cd88acb41ce835f47c49727fab88eabd7d1ee18b;hpb=983841e440e7d553509df86c16e7417b7bd750a0;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index cd88acb..356b0bf 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -180,7 +180,7 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, apache2-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
+    hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
   spohr:
     address: 192.25.206.33
     parents: samosa
@@ -454,7 +454,7 @@ servers:
   agnesi:
     address: 65.173.90.83
     parents: gw-agnesi
-    hostgroups: deadslow
+    hostgroups: deadslow, lenny
 
   spontini:
     address: 137.82.84.65
@@ -953,7 +953,7 @@ services:
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3"
     depends: network service - sshd
     hostgroups: computers, deadslow
-    excludehosts: agnesi, crest, kullervo
+    excludehosts: crest, kullervo
     excludehostgroups: lenny
     normal_check_interval:  60
   -
@@ -967,10 +967,11 @@ services:
     check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
     depends: network service - sshd
     hostgroups: lenny
+    excludehosts: agnesi
     normal_check_interval:  60
   -
     name: "network service - sshd - version - 2260"
-    check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch3"
+    check: "dsa_check_ssh_port_version!2260!OpenSSH_5.1p1 Debian-5"
     depends: network service - sshd - 2260
     hosts: agnesi
     normal_check_interval:  60