X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=48a19ad834cef6217dd3c0bb11eb42c4c38e0763;hb=cf7cc5b142e2364c5e3550384031ff075dc460a8;hp=4e7e1916013595effcf1fb7b7084e12f4a60e3de;hpb=2e4d21de782c19ecd9fd63e1e098a7dcbe3bcc8c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4e7e191..48a19ad 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -186,7 +186,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts, apache2-hosts
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
@@ -202,7 +202,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, nfs-server, spamd, heavy-exim, bind9-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, nfs-server, spamd, heavy-exim, bind9-hosts, apache-https
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -253,7 +253,7 @@ servers:
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https
     contacts: bzed
   heininen:
     address: 82.195.75.98
@@ -266,7 +266,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts
   geo1:
     address: 82.195.75.105
     parents: unger
@@ -274,7 +274,7 @@ servers:
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https
   kaufmann:
     address: 82.195.75.107
     parents: unger
@@ -286,7 +286,7 @@ servers:
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim
+    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay
   byrd:
     address: 82.195.75.92
     parents: unger
@@ -314,7 +314,7 @@ servers:
   franck:
     address: 128.148.34.3
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https
 
   mayer:
     address: 140.211.166.78
@@ -395,7 +395,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, bind9-hosts
     contacts: bzed
 
   pergolesi:
@@ -418,7 +418,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts, service
+    hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts, service, apache2-hosts
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
@@ -435,7 +435,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts
     contacts: joerg
 
   schumann:
@@ -449,7 +449,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, postgres83-hosts
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, postgres83-hosts, apache-https
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -457,7 +457,7 @@ servers:
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts
 
   caballero:
     address: 193.201.200.200
@@ -516,11 +516,11 @@ servers:
     hostgroups: computers, bl460, acpid-hosts, service
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts
   brahms:
     address: 206.12.19.115
     parents: dijkstra
@@ -540,7 +540,7 @@ servers:
   bellini:
     address: 206.12.19.7
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service
+    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
@@ -552,19 +552,19 @@ servers:
   cimarosa:
     address: 206.12.19.8
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, apache2-hosts, service
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, service
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -616,15 +616,15 @@ servers:
   lotti:
     address: 206.12.19.121
     parents: tchaikovsky
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
   quantz:
     address: 206.12.19.122
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts
   nono:
     address: 206.12.19.123
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, xinetd-hosts, apache2-hosts, apache-https
 
   lebrun:
     address: 193.198.184.10
@@ -677,7 +677,7 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts
 
 #  lafayette:
 #    address: 147.215.7.160
@@ -687,7 +687,7 @@ servers:
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service
+    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
@@ -728,7 +728,7 @@ servers:
   orff:
     address: 194.177.211.209
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs
+    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs, apache2-hosts
   field:
     address: 194.177.211.210
     parents: rautavaara
@@ -742,7 +742,7 @@ servers:
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -755,7 +755,7 @@ servers:
   lindberg:
     address: 86.59.118.149
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service
+    hostgroups: computers, acpid-hosts, service, apache2-hosts
     # which raid?
 
   abel:
@@ -881,6 +881,9 @@ hostgroups:
   heavy-exim:
     alias: "hosts running the full mail stuff, including clamav and postgrey"
     private: 1
+  mail-relay:
+    alias: "relays usually are hosts with more exim processes"
+    private: 1
   spamd:
     alias: "hosts running spamassassin as daemon"
     private: 1
@@ -935,6 +938,9 @@ hostgroups:
   bosserver:
     alias: hosts running bosserver
     private: 1
+  apache-https:
+    alias: hosts with https services
+    private: 1
 
   nfs-client:
     alias: hosts mounting filesystems using NFS
@@ -1077,6 +1083,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
+    excludehosts: ries
+  -
+    name: disk usage on /srv
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
+    hosts: ries
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -1117,23 +1129,18 @@ services:
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni, wieck
+    hosts: busoni, wieck, heininen
 
   -
     name: disk usage on /srv/morgue.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
     hosts: stabile
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
     hosts: stabile, beethoven, sibelius
-  -
-    name: disk usage on /srv/ftp-master.debian.org
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/ftp-master.debian.org"
-    hosts: stabile
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
@@ -1439,8 +1446,12 @@ services:
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
-    excludehostgroups: postfix-hosts
+    excludehostgroups: postfix-hosts, mail-relay
     excludehosts: master, busoni, merkel, quantz
+  -
+    name: process - exim
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
+    hostgroups: mail-relay
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
@@ -1940,6 +1951,11 @@ 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: unwanted process - apache2
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2"
+    hostgroups: computers
+    excludehostgroups: apache2-hosts
 
   -
     name: network service - http
@@ -1965,37 +1981,24 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg, vivaldi
+    hostgroups: apache-https
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    # ries		ftp-master.debian.org
-    # chopin		security-master.debian.org
-    # spohr		rt.debian.org
-    # tchaikovsky	nagios.debian.org
-    # draghi		db.debian.org
-    # merkel2		nm.debian.org
-    # liszt		lists.debian.org
-    # grieg		buildd.debian.org
-    # vivaldi		fossology.debian.org
-    hosts: franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg, vivaldi
+    hostgroups: apache-https
     depends: network service - https
     normal_check_interval: 60
-
-  # merkel
-  -
-    name: network service - https
-    check: check_https
-    hosts: merkel2
-    depends: "merkel:process - apache2 - master"
-    normal_check_interval: 120
   -
-    name: network service - http
-    check: check_http
-    hosts: merkel2
-    depends: "merkel:process - apache2 - master"
+    name: unwanted network service - https
+    check: dsa_check_port_closed!443
+    hostgroups: apache2-hosts
+    excludehostgroups: apache-https
+    # ravel does ssh on port 443
+    excludehosts: ravel
+    normal_check_interval: 60
+
  ####
   -
     name: process - named