X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=41909ebcf9d8edeae616d28ab77cb354641bfed5;hb=b8582c8caec8828f76eb14cd65e94c31885f92eb;hp=5b22d6628e4c091b80734180362eda8738bc27e1;hpb=45cd1e7637fbc6fc4e6499d837698d77076d1b95;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 5b22d66..41909eb 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -554,6 +554,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
+    excludehosts: ries
+  -
+    name: disk usage on /
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
+    hosts: ries
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -568,12 +574,12 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini
   -
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
-    hosts: merkel
+    hosts: merkel, bartok
   -
     name: disk usage on /srv
     servicegroups: diskspace
@@ -731,9 +737,15 @@ services:
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2"
     depends: network service - sshd
     hostgroups: computers, deadslow
-    excludehosts: agnesi
+    excludehosts: agnesi, crest, kullervo
     excludehostgroups: lenny
     normal_check_interval:  360
+  -
+    name: "network service - sshd - version"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2+m68k1"
+    depends: network service - sshd
+    hosts: crest, kullervo
+    normal_check_interval:  360
   -
     name: "network service - sshd - version"
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.7p1 Debian-9"
@@ -1200,7 +1212,7 @@ 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 -g openldap -u openldap'"
+    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: samosa
  ###
   -