X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=eef3446c93ed4aa4a4d56162c318f5e15851245a;hb=bf62c544c7f302196d043d0119719778feebc58b;hp=d23355ca01a6b098fd891d97961727913b34642c;hpb=67d93f1db68924fac2d38081a868643cdf7653f9;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d23355c..eef3446 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -111,7 +111,7 @@ servers:
   #  parents: gw-HP-ftc
   #  hostgroups: routing-infrastructure
   gw-agnesi:
-    address: 65.173.90.18
+    address: 65.173.90.22
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-ubc:
@@ -358,7 +358,7 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, heavy-exim, lenny
 
   saens:
     address: 128.101.240.212
@@ -428,7 +428,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, ulogd-hosts, lenny, hassrvfs, hasbootfs
+    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -472,7 +472,7 @@ servers:
     contacts: luk
 
   agnesi:
-    address: 65.173.90.83
+    address: 67.233.102.241
     parents: gw-agnesi
     hostgroups: deadslow, lenny
 
@@ -490,8 +490,8 @@ servers:
     parents: gw-ubc
     hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts
   luchesi:
-    address: 137.82.84.78
-    parents: gw-ubc
+    address: 206.12.19.214
+    parents: gw-ubcnew
     hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts
   wolkenstein:
     address: 137.82.84.89
@@ -682,12 +682,6 @@ hostgroups:
     alias: hosts not running samhain properly
     private: 1
 
-  #syslog-ng-hosts:
-  #  alias: hosts running syslog-ng instead of sysklogd
-  #  private: 1
-  #rsyslog-hosts:
-  #  alias: hosts running rsyslogd instead of sysklogd
-  #  private: 1
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -1138,21 +1132,8 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: lenny
-    excludehosts: agnesi
- ###
- # -
- #   name: process - rsyslogd
- #   nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
- #   hostgroups: rsyslog-hosts
- ###
-  -
-    name: process - syslogd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
-    hosts: rietz
-  -
-    name: process - klogd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
     hosts: rietz
+    excludehosts: agnesi
 
  ### MAIL STUFF
  ###
@@ -1638,7 +1619,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, klecker, draghi, liszt, spohr, widor
+    hosts: ries, klecker, draghi, liszt, spohr, widor, rietz
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1651,7 +1632,7 @@ services:
     # draghi		db.debian.org
     # merkel2		nm.debian.org
     # liszt		lists.debian.org
-    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt, widor
+    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt, widor, rietz
     depends: network service - https
     normal_check_interval: 60
 
@@ -1753,7 +1734,6 @@ services:
     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: klecker
   #-
   #  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'"
@@ -1761,10 +1741,14 @@ services:
   -
     name: process - postresql83 - dak 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/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
-    hosts: ries, klecker
+    hosts: klecker, chopin
+  -
+    name: process - postresql84 - dak master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
+    hosts: ries
   -
-    name: process - postresql83 - dak-dev 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/dak-dev -c config_file=/etc/postgresql/8.3/dak-dev/postgresql.conf'"
+    name: process - postresql84 - dak-dev master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"
     hosts: ries
  ####
   -