X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=0c6d1bf126fc62a923bb280fcc30f0a391ea3b0c;hb=e7ed9302c5b4213f77c34f62469c829772f131d7;hp=1b8a35918ce7b9bddd45460a61b3aec719f84453;hpb=1e9e84fa333b0686445fe6ad39e583d9a24f397f;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 1b8a359..0c6d1bf 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -17,7 +17,6 @@
 
 # down:
 #  - sarti
-#  - goedel
 #  - leisner
 
 ---
@@ -126,7 +125,7 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-ubc:
-    address: 137.82.84.41
+    address: 137.82.84.94
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: lfilipoz
@@ -151,6 +150,15 @@ servers:
     address: 78.32.9.209
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-cst:
+    address: 213.188.99.215
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+
+  global:
+    hostgroups: notacomputer
+    pingable: false
+    check_command: dsa_check_always_ok
 
   samosa:
     address: 192.25.206.57
@@ -158,7 +166,7 @@ servers:
   raff:
     address: 192.25.206.59
     parents: samosa
-    hostgroups: computers, no-udev, service, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client
   gluck:
     address: 192.25.206.10
     parents: samosa
@@ -166,11 +174,11 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts
+    hostgroups: computers, general, apache1-hosts, apache2-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts
   spohr:
     address: 192.25.206.33
     parents: samosa
-    hostgroups: computers, service, dl380, apache2-hosts, postgres81-hosts, ulogd-hosts, nfs-server
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server
   peri:
     address: 192.25.206.15
     parents: samosa
@@ -188,7 +196,7 @@ servers:
   paer:
     address: 192.25.206.11
     parents: samosa
-    hostgroups: computers, porterbox, bind9-hosts, single-cpu
+    hostgroups: computers, porterbox, lenny
   merulo:
     address: 192.25.206.58
     parents: samosa
@@ -202,7 +210,7 @@ servers:
   morales:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu
+    hostgroups: computers, porterbox, single-cpu, no-samhain
     contacts: bzed
   sperger:
     address: 82.195.75.98
@@ -306,7 +314,7 @@ servers:
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
-    hostgroups: computers, no-udev, porterbox, single-cpu, deadslow
+    hostgroups: computers, no-udev, porterbox, single-cpu
 
   raptor:
     address: 195.243.109.162
@@ -394,12 +402,12 @@ servers:
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts
-  kassia2:
+    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts
+  kassia-sec:
     address: 130.89.149.225
     parents: kassia
     hostgroups: secondary-IPs
-  kassia3:
+  kassia-ftp:
     address: 130.89.149.226
     parents: kassia
     hostgroups: secondary-IPs
@@ -420,14 +428,14 @@ servers:
     hostgroups: deadslow
 
   spontini:
-    address: 137.82.84.42
+    address: 137.82.84.65
     parents: gw-ubc
     hostgroups: computers, buildd
     contacts: lfilipoz
   ravel:
-    address: 137.82.84.43
+    address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -446,7 +454,7 @@ servers:
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts
+    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny
     contacts: holger
 
   rem:
@@ -459,6 +467,20 @@ servers:
     parents: gw-ball
     hostgroups: computers, buildd, no-udev, dialup
 
+  zelenka:
+    address: 80.245.147.40
+    parents: gw-HP-ftc
+    hostgroups: computers, porterbox, lenny
+
+  escher:
+    address: 213.188.99.215
+    parents: gw-cst
+    hostgroups: computers, single-cpu
+  goedel:
+    address: 213.188.99.214
+    parents: gw-cst
+    hostgroups: computers, single-cpu
+
 #############################
 # host groups
 #
@@ -473,6 +495,9 @@ hostgroups:
     alias: Internet routers and friends
     extinfo-icon_image: base/switch40.png
     extinfo-icon_image_alt: router
+  notacomputer:
+    alias: Systems that are not really systems.  Yeah :)
+    private: 1
   deadslow:
     alias: Systems too slow to run any real checks
   dialup:
@@ -562,6 +587,9 @@ hostgroups:
   postgres81-hosts:
     alias: hosts running postgres81
     private: 1
+  postgres83-hosts:
+    alias: hosts running postgres83
+    private: 1
   mysql-hosts:
     alias: hosts running mysql
     private: 1
@@ -624,7 +652,7 @@ services:
   -
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
-    hostgroups: all
+    hostgroups: pingable
     excludehostgroups: routing-infrastructure, dialup
     normal_check_interval: 5
     max_check_attempts: 4
@@ -662,12 +690,12 @@ services:
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti, rem, ball
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti, rem, ball, goedel, escher
   -
     name: disk usage on /var
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, tartini, morales, powell
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, tartini, morales, powell, escher
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -682,7 +710,7 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -692,7 +720,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell, piatti
+    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -702,7 +730,7 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, voltaire, lebrun, rem, ball
+    hosts: raptor, voltaire, lebrun, rem, ball, paer, escher
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -824,6 +852,7 @@ services:
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
+    excludehosts: zelenka
  ####
   -
     name: process - sshd
@@ -870,7 +899,7 @@ services:
     normal_check_interval:  360
   -
     name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-3"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
     depends: network service - sshd
     hostgroups: lenny
     normal_check_interval:  360
@@ -917,18 +946,18 @@ services:
     # etch: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ntp -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
-    excludehosts: raptor
+    excludehosts: raptor, zelenka
   -
     name: network service - ntp
     check: check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: raptor, allegri
+    excludehosts: raptor, allegri, zelenka
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: raptor, allegri
+    hosts: raptor, allegri, zelenka
     depends: process - xinetd
 
  ###
@@ -1385,7 +1414,7 @@ services:
  ###
   -
     name: process - acpid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid -c /etc/acpi/events -s /var/run/acpid.socket'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid'"
     hostgroups: acpid-hosts
   -
     name: unexpected process - acpid
@@ -1397,13 +1426,13 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, raptor, allegri, gluck
+    hosts: samosa, raptor, allegri, gluck, zelenka
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, raptor, allegri, gluck
+    excludehosts: samosa, raptor, allegri, gluck, zelenka
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1424,6 +1453,12 @@ services:
     hosts: rietz2
     depends: rietz:process - xinetd
 
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: kassia-sec
+    depends: kassia:process - xinetd
+
  ###
   -
     name: process - nagios3
@@ -1445,8 +1480,13 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
+    excludehosts: kassia
     depends: process - apache2 - master
-
+  -
+    name: network service - http
+    check: check_http
+    depends: kassia:process - apache2 - master
+    hosts: kassia-sec, kassia-ftp
 
 
   -
@@ -1468,7 +1508,7 @@ services:
     name: network service - http keyserver
     check: dsa_check_http_port!11371
     hosts: raff
-    depends: process - apache - master
+    depends: process - apache2 - master
 
   -
     name: network service - https
@@ -1503,15 +1543,23 @@ services:
     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
+    excludehosts: kassia
   -
     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
+    excludehosts: kassia
   -
     name: network service - ftp
     check: check_ftp
     hostgroups: ftpd-hosts
+    excludehosts: kassia
     depends: process - vsftp - listener
+  -
+    name: network service - ftp
+    check: check_ftp
+    hosts: kassia-sec, kassia-ftp
+    depends: kassia:process - xinetd
 
  ####
   -
@@ -1539,6 +1587,36 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats collector process'"
     hostgroups: postgres81-hosts
     depends: process - postresql81 - master
+ ####
+  -
+    name: process - postresql83 - master
+    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/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
+    hostgroups: postgres83-hosts
+    excludehosts: piatti
+  -
+    name: process - postresql83 - master
+    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'"
+    hosts: piatti
+  -
+    name: process - postresql83 - writer
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: writer process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
+  -
+    name: process - postresql83 - wal writer
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: wal writer process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
+  -
+    name: process - postresql83 - autovacuum launcher
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: autovacuum launcher process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
+  -
+    name: process - postresql83 - stats collector
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: stats collector process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
  ####
   -
     name: process - mysql - master
@@ -1550,6 +1628,16 @@ services:
     hostgroups: mysql-hosts
     depends: process - mysql - master
 
+ ####
+  -
+    name: process - stunnel4 - postgres-udd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
+    hosts: piatti
+  -
+    name: process - stunnel4 - postgres-udd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd.conf'"
+    hosts: merkel
+
  ####
   #-
   #  name: process - xenconsoled
@@ -1577,6 +1665,7 @@ services:
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
     hostgroups: buildd
+    contacts: luk
 
  ###
   -
@@ -1590,10 +1679,10 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
     hostgroups: tftpd-hosts
  ###
-  -
-    name: process - dhcpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
-    hosts: paer
+#  -
+#    name: process - dhcpd
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
+#    hosts: paer
  ###
   -
     name: process - monit
@@ -1637,3 +1726,46 @@ services:
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
     hosts: merkel, raff
+
+ ############ MISC OTHER Stuff ############
+ #####
+  -
+    name: mirror sync - security
+    check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: mirror sync - security.eu
+    check: "dsa_check_mirrorsync!security.eu.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: mirror sync - security.us
+    check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: DNS SOA sync - debprivate-ftcollins.debian.org
+    check: "dsa_check_soas!debprivate-ftcollins.debian.org"
+    hosts: global
+  -
+    name: DNS SOA sync - debian.org
+    check: "dsa_check_soas_add!samosa.debian.org!debian.org"
+    hosts: global
+  -
+    name: DNS SOA sync - debian.net
+    check: "dsa_check_soas_add!samosa.debian.org!debian.net"
+    hosts: global
+  -
+    name: DNS SOA sync - debian.com
+    check: "dsa_check_soas_add!samosa.debian.org!debian.com"
+    hosts: global
+  -
+    name: DNS SOA sync - mirror.debian.net
+    check: "dsa_check_soas_add!samosa.debian.org!mirror.debian.net"
+    hosts: global
+  -
+    name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
+    check: "dsa_check_soas_add!samosa.debian.org!144-28.118.59.86.in-addr.arpa"
+    hosts: global
+  -
+    name: DNS SOA sync - alioth.debian.org
+    check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
+    hosts: global