X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=eab956b7e8f980e3d49a76c3f949bc4ddbb86c8b;hb=7a5951043c70c1769b8204976b0a82ccb531be5e;hp=7d0fd43bfa65fdecb0a38439315d6664e70ecd84;hpb=74fcb5cf4cefb61dc95b384d616c66c9175bc8ab;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 7d0fd43..eab956b 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -114,7 +114,7 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-utwente:
-    address: 130.89.160.1
+    address: 130.89.149.1
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   #gw-ughent:
@@ -152,6 +152,11 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
 
+  global:
+    hostgroups: notacomputer
+    pingable: false
+    check_command: dsa_check_always_ok
+
   samosa:
     address: 192.25.206.57
     hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim
@@ -170,7 +175,7 @@ servers:
   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
@@ -345,7 +350,7 @@ servers:
   puccini:
     address: 87.106.4.56
     parents: gw-1und1
-    hostgroups: computers, buildd, lenny, rsyslog-hosts
+    hostgroups: computers, buildd, lenny, rsyslog-hosts, ulogd-hosts
     contacts: joerg
   powell:
     address: 87.106.64.223
@@ -360,7 +365,7 @@ servers:
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts
 
   caballero:
     address: 193.201.200.200
@@ -392,9 +397,21 @@ servers:
     hostgroups: computers, porterbox, single-cpu, smart
 
   kassia:
-    address: 130.89.175.54
+    address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts
+    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
+  kassia-ftp:
+    address: 130.89.149.226
+    parents: kassia
+    hostgroups: secondary-IPs
+  kassia4:
+    address: 130.89.149.227
+    parents: kassia
+    hostgroups: secondary-IPs
 
   allegri:
     address: 157.193.39.233
@@ -461,6 +478,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:
@@ -550,6 +570,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
@@ -612,7 +635,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
@@ -858,7 +881,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-4"
     depends: network service - sshd
     hostgroups: lenny
     normal_check_interval:  360
@@ -1412,6 +1435,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
@@ -1433,8 +1462,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
 
 
   -
@@ -1491,15 +1525,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
 
  ####
   -
@@ -1527,6 +1569,31 @@ 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
+  -
+    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
@@ -1625,3 +1692,18 @@ 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
+    check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: mirror sync - eu
+    check: "dsa_check_mirrorsync!security.eu.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: mirror sync - us
+    check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
+    hosts: global