X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=836e83baed70e2b7e0a3e519c561f28a0f2ddb0c;hb=7b36095ff696086f08d8427ace4fe8afcf825210;hp=3ed8092ef6fa71f899783f5ede386d4b47d4a17c;hpb=65749b382591500b749a17d3ad0963c4283794dd;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 3ed8092..836e83b 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -98,10 +98,6 @@ servers: address: 193.201.200.129 parents: gw-HP-ftc hostgroups: routing-infrastructure - gw-xandros: - address: 67.210.160.81 - parents: gw-HP-ftc - hostgroups: routing-infrastructure gw-nmmn: address: 217.114.76.81 parents: gw-HP-ftc @@ -185,7 +181,7 @@ servers: merkel: address: 192.25.206.16 parents: spohr - hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny + hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny merkel2: address: 192.25.206.71 parents: merkel @@ -214,7 +210,7 @@ servers: paer: address: 192.25.206.11 parents: spohr - hostgroups: computers, porterbox, lenny, hasbootfs + hostgroups: computers, porterbox, lenny, hasbootfs, hashomefs, single-cpu merulo: address: 192.25.206.58 parents: spohr @@ -271,6 +267,10 @@ servers: address: 82.195.75.106 parents: unger hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, heavy-exim, ulogd-hosts + kaufmann: + address: 82.195.75.107 + parents: unger + hostgroups: computers, service, lenny, hasbootfs, apache2-hosts master: address: 70.103.162.29 @@ -328,6 +328,10 @@ servers: address: 128.31.0.49 parents: gw-mit-csail hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts + senfl: + address: 128.31.0.51 + parents: gw-mit-csail + hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts carver: address: 128.31.0.50 parents: gw-mit-csail @@ -386,7 +390,7 @@ servers: voltaire: address: 72.66.115.54 parents: gw-frost - hostgroups: computers, buildd, lenny, hasvarfs + hostgroups: computers, buildd, lenny, hasvarfs, hashomefs contacts: sfrost puccini: @@ -422,15 +426,6 @@ servers: parents: gw-blackcat hostgroups: computers, no-udev, buildd, sw-raid, lenny - elara: - address: 67.210.160.90 - parents: gw-xandros - hostgroups: deadslow - europa: - address: 67.210.160.89 - parents: gw-xandros - hostgroups: deadslow - pescetti: address: 217.114.76.85 parents: gw-nmmn @@ -453,11 +448,6 @@ servers: parents: kassia hostgroups: secondary-IPs - allegri: - address: 157.193.39.233 - parents: gw-ghent - hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs, incomingmailrelayed2025 - contacts: luk ancina: address: 157.193.39.13 parents: gw-ghent @@ -477,7 +467,7 @@ servers: ravel: address: 137.82.84.66 parents: gw-ubc - hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny + hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server dijkstra: address: 137.82.84.70 parents: gw-ubc @@ -494,6 +484,22 @@ servers: address: 137.82.84.77 parents: dijkstra hostgroups: computers, lenny, hasbootfs, hassrvfs + valente: + address: 137.82.84.76 + parents: dijkstra + hostgroups: computers, lenny, hasbootfs, single-cpu + bellini: + address: 137.82.84.79 + parents: gw-ubc + hostgroups: computers, lenny, hasbootfs, nfs-client, hashomefs, hassrvfs + stabile: + address: 137.82.84.72 + parents: gw-ubc + hostgroups: computers, lenny, hashomefs, sw-raid + cimarosa: + address: 137.82.84.80 + parents: gw-ubc + hostgroups: computers, lenny, hasbootfs lebrun: address: 193.198.184.10 @@ -518,12 +524,12 @@ servers: rem: address: 195.71.99.217 parents: gw-telefonica - hostgroups: computers, buildd, hasbootfs, lenny + hostgroups: computers, buildd, hasbootfs, lenny, hashomefs ball: address: 78.32.9.213 parents: gw-ball - hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny + hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs zelenka: address: 80.245.147.40 @@ -533,7 +539,7 @@ servers: escher: address: 213.188.99.215 parents: gw-cst - hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs + hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs, hashomefs goedel: address: 213.188.99.214 parents: gw-cst @@ -700,6 +706,9 @@ hostgroups: hassrvfs: alias: hosts with a /srv filesystem private: 1 + hashomefs: + alias: hosts with a /home filesystem + private: 1 hasvarfs: alias: hosts with a /var filesystem private: 1 @@ -823,7 +832,7 @@ services: name: disk usage on /home servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home" - hosts: voltaire, rem, ball, paer, escher + hostgroups: hashomefs - name: disk usage on /home servicegroups: diskspace @@ -849,6 +858,21 @@ services: servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql" hosts: samosa + - + name: disk usage on /srv/morgue.debian.org + servicegroups: diskspace + nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org" + hosts: stabile + - + name: disk usage on /srv/mirrors + servicegroups: diskspace + nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors" + hosts: stabile + - + name: disk usage on /srv/ftp-master.debian.org + servicegroups: diskspace + nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/ftp-master.debian.org" + hosts: stabile ############ All Computers ############ #### @@ -977,12 +1001,6 @@ services: normal_check_interval: 60 notification_interval: 1440 - - - name: "network service - sshd" - check: dsa_check_ssh - hostgroups: deadslow - excludehosts: agnesi - normal_check_interval: 180 - name: "network service - sshd - 2260" check: dsa_check_ssh_port!2260 @@ -1057,12 +1075,12 @@ services: check: dsa_check_ntp hostgroups: computers depends: process - ntpd - excludehosts: allegri, zelenka, ancina + excludehosts: zelenka, ancina # - name: network service - time check: dsa_check_time - hosts: allegri, zelenka, ancina + hosts: zelenka, ancina depends: process - xinetd ### @@ -1133,6 +1151,7 @@ services: name: process - clamav - getsigs nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C getclamsigs -a 'getclamsigs'" hostgroups: heavy-exim, heavy-postfix + excludehosts: master, powell # - name: unwanted process - clamav @@ -1149,12 +1168,17 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C getclamsigs" hostgroups: computers excludehostgroups: heavy-exim, heavy-postfix + hosts: master, 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 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'" hostgroups: heavy-exim - excludehosts: rietz, merkel, raff + excludehosts: rietz, merkel, raff, 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'" + hosts: 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 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'" @@ -1527,13 +1551,13 @@ services: - name: process - xinetd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'" - hosts: allegri, gluck, zelenka, ancina, draghi + hosts: gluck, zelenka, ancina, draghi hostgroups: rsyncd-hosts - name: unwanted process - xinetd nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd" hostgroups: computers - excludehosts: allegri, gluck, zelenka, ancina, draghi + excludehosts: gluck, zelenka, ancina, draghi excludehostgroups: rsyncd-hosts ### - @@ -1834,6 +1858,10 @@ services: name: nfs mount ftp archive nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp" hosts: merkel, raff + - + name: nfs mount ftp archive + nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp" + hosts: bellini ############ MISC OTHER Stuff ############ ##### @@ -1853,6 +1881,10 @@ services: name: mirror sync - security.us check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org" hosts: global + - + name: DNS SOA sync - security.geo.debian.org + check: "dsa_check_soas!security.geo.debian.org" + hosts: global - name: DNS SOA sync - debian.org check: "dsa_check_soas_add!draghi.debian.org!debian.org"