X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=5d5cb9f0b578db567d9a9d40d5950680f3ee4b8a;hb=ada5273555cb620b3bac4ee05f1e308dc8b615d1;hp=ed7eb929f0a3ca02cc02a2c329357e5985e0bbbf;hpb=b7d928452422b9108b8b6bf9800d4f94cab9917b;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index ed7eb92..5d5cb9f 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -193,7 +193,7 @@ servers: hostgroups: secondary-IPs spohr: address: 192.25.206.33 - hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim, bind9-hosts + hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, spamd, heavy-exim, bind9-hosts spohr2: address: 192.25.206.38 parents: spohr @@ -271,7 +271,7 @@ servers: draghi: address: 82.195.75.106 parents: unger - hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, heavy-exim, ulogd-hosts + hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, ulogd-hosts kaufmann: address: 82.195.75.107 parents: unger @@ -284,7 +284,7 @@ servers: master: address: 70.103.162.29 parents: gw-brainfood - hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload, lenny + hostgroups: computers, general, apache2-hosts, bind9-hosts, spamd, heavy-exim, highload, lenny murphy: address: 70.103.162.31 parents: gw-brainfood @@ -294,7 +294,7 @@ servers: ries: address: 128.148.34.103 parents: gw-brown.edu - hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, heavy-exim, acpid-hosts, lenny, uploadqueue + hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, lenny, uploadqueue mayer: address: 140.211.166.78 @@ -316,6 +316,10 @@ servers: address: 140.211.166.44 parents: rietz hostgroups: secondary-IPs + busoni: + address: 140.211.15.34 + parents: gw-osuosl + hostgroups: computers, service, lenny, dl360, hassrvfs, acpid-hosts zee: address: 140.211.166.16 parents: gw-osuosl @@ -358,7 +362,7 @@ servers: klecker: address: 194.109.137.218 parents: gw-xs4all - hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, heavy-exim, lenny + hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, spamd, heavy-exim, lenny saens: address: 128.101.240.212 @@ -394,6 +398,11 @@ servers: # SMP kernel doesn't run stable hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny contacts: tjrc1 + sibelius: + address: 193.62.202.28 + parents: gw-sanger + hostgroups: computers, lenny + contacts: tjrc1 smetana: address: 193.62.202.29 parents: gw-sanger @@ -414,7 +423,7 @@ servers: powell: address: 87.106.64.223 parents: gw-1und1 - hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, hassrvfs, hasvarfs, hasusrfs + hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, hassrvfs, hasvarfs, hasusrfs contacts: joerg schumann: @@ -486,31 +495,31 @@ servers: parents: gw-ubcnew hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue dijkstra: - address: 137.82.84.70 - parents: gw-ubc + address: 206.12.19.218 + parents: gw-ubcnew hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts luchesi: address: 206.12.19.214 parents: gw-ubcnew hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts wolkenstein: - address: 137.82.84.89 + address: 206.12.19.116 parents: dijkstra hostgroups: computers, lenny, hasbootfs, hassrvfs brahms: - address: 137.82.84.74 + address: 206.12.19.115 parents: dijkstra hostgroups: computers, lenny, buildd, hasbootfs, hassrvfs geo2: - address: 137.82.84.71 + address: 206.12.19.113 parents: dijkstra hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts duarte: - address: 137.82.84.77 + address: 206.12.19.114 parents: dijkstra - hostgroups: computers, lenny, hasbootfs, hassrvfs + hostgroups: computers, lenny, hasbootfs, hassrvfs, single-cpu valente: - address: 137.82.84.76 + address: 206.12.19.112 parents: dijkstra hostgroups: computers, lenny, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts bellini: @@ -518,8 +527,8 @@ servers: parents: gw-ubc hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim morricone: - address: 137.82.84.81 - parents: gw-ubc + address: 206.12.19.9 + parents: gw-ubcnew hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts stabile: address: 137.82.84.72 @@ -530,16 +539,16 @@ servers: parents: gw-ubc hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client paganini: - address: 137.82.84.82 - parents: gw-ubc + address: 206.12.19.10 + parents: gw-ubcnew hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs respighi: address: 137.82.84.83 parents: gw-ubc hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs vivaldi: - address: 137.82.84.84 - parents: gw-ubc + address: 206.12.19.12 + parents: gw-ubcnew hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs # MSA 2000 (2012i) giustini: @@ -686,7 +695,10 @@ hostgroups: alias: hosts running postfix instead of exim private: 1 heavy-exim: - alias: "hosts running the full mail stuff, including clamav, SA, and postgrey" + alias: "hosts running the full mail stuff, including clamav and postgrey" + private: 1 + spamd: + alias: "hosts running spamassassin as daemon" private: 1 heavy-postfix: alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, policyd-weight" @@ -1183,8 +1195,8 @@ 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, bellini + hostgroups: spamd + excludehosts: powell - 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'" @@ -1197,9 +1209,8 @@ services: name: process - spamd - child nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'" hosts: liszt - hostgroups: heavy-exim + hostgroups: spamd depends: process - spamd - master - excludehosts: rietz, merkel, raff, bellini # - name: process - spamd - master @@ -1214,12 +1225,8 @@ services: name: unwanted process - spamd nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd" hostgroups: computers - excludehostgroups: heavy-exim - excludehosts: liszt - - - name: unwanted process - spamd - nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd" - hosts: merkel, raff, bellini + excludehostgroups: spamd + excludehosts: liszt, rietz ### #- @@ -1622,20 +1629,20 @@ services: - name: network service - https check: check_https - hosts: ries, klecker, draghi, liszt, spohr, widor, rietz + hosts: ries, chopin, draghi, liszt, spohr, widor, rietz depends: "process - apache2 - master" normal_check_interval: 120 - name: network service - https cert check: dsa_check_cert!443 # ries ftp-master.debian.org - # klecker security-master.debian.org + # chopin security-master.debian.org # spohr rt.debian.org # spohr2 nagios.debian.org # draghi db.debian.org # merkel2 nm.debian.org # liszt lists.debian.org - hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt, widor, rietz + hosts: ries, chopin, spohr, spohr2, draghi, merkel2, liszt, widor, rietz depends: network service - https normal_check_interval: 60 @@ -1705,7 +1712,7 @@ services: #### - name: process - debianqueued - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued" + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued" hostgroups: uploadqueue ###