X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=25d68546a7156527cc480ea26dcb46ed79ecabad;hb=531a0429e4751fe4265df4cdd1cfff78103ba066;hp=ea45c73b681e18107e688af57c56bffd756bf0dd;hpb=b49b22ab3bb262b30ac300d2c48497e6f6a91f32;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index ea45c73..25d6854 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:
@@ -170,7 +170,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
@@ -392,9 +392,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
@@ -550,6 +562,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
@@ -858,7 +873,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 +1427,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 +1454,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 +1517,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 +1561,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