X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=6aeb2cd99a068efd85fa25737fe2b80a31eedbc5;hb=39c790949aa4601f67ad4aac2d803c3570d519c0;hp=1e85abd94ff207a405d6ccb921ad1d26bec92b69;hpb=383a8f90215fe499dfdc014d119e07cccb096253;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 1e85abd..6aeb2cd 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: @@ -119,6 +119,11 @@ servers: parents: gw-HP-ftc hostgroups: routing-infrastructure contacts: lfilipoz + gw-ubcnew: + address: 206.12.19.254 + parents: gw-HP-ftc + hostgroups: routing-infrastructure + contacts: lfilipoz gw-carnet: address: 161.53.160.1 parents: gw-HP-ftc @@ -153,7 +158,7 @@ servers: parents: gw-HP-ftc hostgroups: routing-infrastructure gw-esiee: - address: 147.215.2.249 + address: 195.220.83.13 parents: gw-HP-ftc hostgroups: routing-infrastructure gw-ghent: @@ -201,7 +206,7 @@ servers: penalosa: address: 192.25.206.68 parents: spohr - hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, single-cpu + hostgroups: computers, buildd, hasbootfs, lenny contacts: dannf mundy: address: 192.25.206.62 @@ -455,7 +460,7 @@ servers: address: 130.89.149.226 parents: kassia hostgroups: secondary-IPs - kassia4: + kassia-volatile: address: 130.89.149.227 parents: kassia hostgroups: secondary-IPs @@ -467,7 +472,7 @@ servers: contacts: luk agnesi: - address: 65.173.90.83 + address: 67.233.102.241 parents: gw-agnesi hostgroups: deadslow, lenny @@ -477,17 +482,17 @@ servers: hostgroups: computers, buildd, hasbootfs, lenny contacts: lfilipoz ravel: - address: 137.82.84.66 - parents: gw-ubc + address: 206.12.19.5 + parents: gw-ubcnew hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts dijkstra: address: 137.82.84.70 parents: gw-ubc hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts luchesi: - address: 137.82.84.78 - parents: gw-ubc - hostgroups: computers, bl460, acpid-hosts, lenny + address: 206.12.19.214 + parents: gw-ubcnew + hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts wolkenstein: address: 137.82.84.89 parents: dijkstra @@ -511,7 +516,7 @@ servers: bellini: address: 137.82.84.79 parents: gw-ubc - hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid + hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim morricone: address: 137.82.84.81 parents: gw-ubc @@ -1195,7 +1200,7 @@ services: name: process - spamd - master nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'" hostgroups: heavy-exim - excludehosts: rietz, merkel, raff, powell + excludehosts: rietz, merkel, raff, powell, bellini - name: process - spamd - master nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'" @@ -1210,7 +1215,7 @@ services: hosts: liszt hostgroups: heavy-exim depends: process - spamd - master - excludehosts: rietz, merkel, raff + excludehosts: rietz, merkel, raff, bellini # - name: process - spamd - master @@ -1230,7 +1235,7 @@ services: - name: unwanted process - spamd nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd" - hosts: merkel, raff + hosts: merkel, raff, bellini ### #- @@ -1446,6 +1451,11 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd" hostgroups: computers + #### + - + name: "host SSL cert" + nrpe: "if [ -e /etc/ssl/certs/thishost.pem ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/thishost.pem; else echo 'No thishost.pem on this host.'; fi" + hostgroups: computers ############ Processes/Services that only run on some computers ############ #### @@ -1615,19 +1625,7 @@ services: name: network service - http check: check_http depends: kassia:process - apache2 - master - hosts: kassia-sec, kassia-ftp - - - # apache1 process on merkel - - - name: process - apache - master - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache -a /usr/sbin/apache" - hosts: merkel - - - name: process - apache - worker - nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:75 -c 1:150 -u www-data -C apache -a /usr/sbin/apache" - hosts: merkel - depends: process - apache - master + hosts: kassia-sec, kassia-ftp, kassia-volatile # keyserver on raff - @@ -1640,7 +1638,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 - @@ -1653,7 +1651,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 @@ -1763,10 +1761,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: klecker + - + 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, klecker - - 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 #### -