X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=1adfa9797ee2624a811f2fb97f68791f2f1a5963;hb=f9d8c7159f59ec2edd9b6f26a4c966816847ad3c;hp=53197cef6b16ae4e51a800f464c0e46a68a2d254;hpb=8fc4eb9fc144651e1779e3eea623b8a5130b2a5b;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 53197ce..1adfa97 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -199,7 +199,7 @@ servers:
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-accumu
   pettersson:
@@ -248,10 +248,6 @@ servers:
     address: 217.140.96.68
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
-  hebden:
-    address: 217.140.96.69
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
   henze:
     address: 217.140.96.70
     parents: gw-arm
@@ -285,7 +281,7 @@ servers:
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT, security_mirror
     contacts: faw
   # }}}
   # {{{ gw-carnet
@@ -302,7 +298,7 @@ servers:
   gluck:
     address: 150.203.164.38
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-conova
   sompek:
@@ -322,7 +318,7 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-dgi
   argento:
@@ -441,7 +437,7 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -486,6 +482,10 @@ servers:
     parents: gw-man-da
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, dl385, acpid-hosts, apache-https, lenny
     contacts: bzed
+  lully:
+    address: 82.195.75.99
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
@@ -493,7 +493,7 @@ servers:
   rem:
     address: 82.195.75.68
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, hashomefs, squeeze
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, squeeze
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
@@ -594,11 +594,11 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-sil
   beethoven:
@@ -670,7 +670,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: sw-ubcece-kais
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs, uploadqueue
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
@@ -714,7 +714,7 @@ servers:
   morricone:
     address: 206.12.19.9
     parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
+    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue
   stabile:
     address: 206.12.19.13
     parents: sw-ubcece-kais
@@ -838,7 +838,7 @@ servers:
   bizet:
     address: 206.12.19.137
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, uploadqueue
   lilburn:
     address: 206.12.19.138
     parents: dijkstra
@@ -859,7 +859,7 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-utwente
   kassia:
@@ -881,7 +881,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1045,9 +1045,6 @@ hostgroups:
   amavis-hosts:
     alias: hosts running amavis
     private: 1
-  ftpd-hosts:
-    alias: hosts running vsftpd
-    private: 1
   #tftpd-hosts:
   #  alias: hosts running a tftpd (tftpd-hpa as a daemon)
   #  private: 1
@@ -1060,9 +1057,6 @@ hostgroups:
   #postgres81-hosts:
   #  alias: hosts running postgres81
   #  private: 1
-  postgres83-hosts:
-    alias: hosts running postgres83
-    private: 1
   postgres84-hosts:
     alias: hosts running postgres84
     private: 1
@@ -1145,6 +1139,9 @@ hostgroups:
     alias: machines with hight round trip times
     private: 1
 
+  security_mirror:
+    alias: hosts that are security mirrors
+    private: 1
 #############################
 # servicegroups
 #############################
@@ -1204,7 +1201,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 90 95"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 10% -c 5%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/home/buildd/build-trees"
     hostgroups: computers
     excludehosts: sibelius
   -
@@ -1285,7 +1282,7 @@ services:
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni, wieck, heininen
+    hosts: busoni, wieck, heininen, lully
   -
     name: disk usage on /var/spool/postfix
     servicegroups: diskspace
@@ -1591,9 +1588,15 @@ services:
     hostgroups: freebsd
 
   -
-    name: remote logging
+    name: remote logging on lotti
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+    runfrom: lotti
+    hostgroups: computers
+    excludehosts: vasks, wagner
+  -
+    name: remote logging on lully
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
-    runfrom: heininen
+    runfrom: lully
     hostgroups: computers
     excludehosts: vasks, wagner
  ### MAIL STUFF
@@ -2243,22 +2246,11 @@ services:
     excludehostgroups: bind9-hosts
 
  ####
-  -
-    name: process - vsftp - listener
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C vsftpd -a 'vsftpd: LISTENER'"
-    hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: klecker
-  -
-    name: process - vsftp - instance
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:80 -c 0:100 -u ftp -C vsftpd -a 'vsftpd: '"
-    hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: klecker
   -
     name: network service - ftp
     check: check_ftp
-    hostgroups: ftpd-hosts, uploadqueue
+    hostgroups: uploadqueue, security_mirror
     excludehosts: klecker
-    depends: process - vsftp - listener
   -
     name: network service - ftp
     check: check_ftp
@@ -2296,7 +2288,7 @@ services:
     name: unwanted process - postresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres83-hosts
+    excludehostgroups: postgres90-hosts, postgres84-hosts
   -
     name: process - postresql90 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.0/bin/postgres'"
@@ -2305,10 +2297,6 @@ services:
     name: process - postresql84 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
     hostgroups: postgres84-hosts
-  -
-    name: process - postresql83 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres'"
-    hostgroups: postgres83-hosts
   #-
   #  name: process - postresql83 - master udd
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"