get rid of apache1 hostgroup, monitor liszt cert/https, fix a dependency

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5be95d7..d9522c6 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -185,7 +185,7 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: spohr
-    hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
+    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
   merkel2:
     address: 192.25.206.71
     parents: merkel
@@ -642,9 +642,6 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
-  apache1-hosts:
-    alias: hosts running apache1
-    private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
@@ -1581,6 +1578,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -C apache2 -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+
   -
     name: network service - http
     check: check_http
@@ -1594,31 +1592,29 @@ services:
     hosts: kassia-sec, kassia-ftp
 
 
+  # apache1 process on merkel
   -
     name: process - apache - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache -a /usr/sbin/apache"
-    hostgroups: apache1-hosts
+    hosts: merkel
   -
     name: process - apache - worker
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:75 -c 1:150 -u www-data -C apache -a /usr/sbin/apache"
-    hostgroups: apache1-hosts
-    depends: process - apache - master
-  -
-    name: network service - http
-    check: check_http
-    hostgroups: apache1-hosts
+    hosts: merkel
     depends: process - apache - master
 
+  # keyserver on raff
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
     hosts: raff
     depends: process - apache2 - master
 
+  # https on various hosts
   -
     name: network service - https
     check: check_https
-    hosts: ries, klecker, draghi
+    hosts: ries, klecker, draghi, liszt, spohr
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1630,7 +1626,8 @@ services:
     # spohr2           nagios.debian.org
     # draghi           db.debian.org
     # merkel2          nm.debian.org
-    hosts: ries, klecker, spohr, spohr2, draghi, merkel2
+    # liszt            lists.debian.org
+    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt
     depends: network service - https
     normal_check_interval: 60