X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=630760446358d3c01c27685194d9705b52b4c69b;hb=0bdfaad3366c22fdf69d3695e9fc73e28a2278e6;hp=1db181ecd65209b6f34c0e2790689bfdf826a136;hpb=4be7f9a87b7d53db4577938ce4813835a4d761ca;p=mirror%2Fdsa-nagios.git diff --git a/nagios-master.cfg b/nagios-master.cfg index 1db181e..6307604 100644 --- a/nagios-master.cfg +++ b/nagios-master.cfg @@ -64,7 +64,7 @@ servers: parents: gw-HP-ftc hostgroups: routing-infrastructure gw-dg-i.net: - address: 195.49.152.190 + address: 93.94.130.190 parents: gw-HP-ftc hostgroups: routing-infrastructure contacts: bzed @@ -180,7 +180,7 @@ servers: merkel: address: 192.25.206.16 parents: samosa - hostgroups: computers, general, apache1-hosts, apache2-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet + hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet spohr: address: 192.25.206.33 parents: samosa @@ -221,7 +221,7 @@ servers: sperger: address: 82.195.75.98 parents: gw-man-da - hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny + hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny, puppet contacts: bzed agricola: address: 82.195.75.86 @@ -274,11 +274,11 @@ servers: mayer: address: 140.211.166.78 parents: gw-osuosl - hostgroups: computers, no-udev, buildd, hasbootfs + hostgroups: computers, buildd, hasbootfs, lenny, puppet mayr: address: 140.211.166.58 parents: gw-osuosl - hostgroups: computers, no-udev, buildd, hasbootfs + hostgroups: computers, buildd, hasbootfs, lenny, puppet malo: address: 140.211.166.27 parents: gw-osuosl @@ -336,10 +336,6 @@ servers: address: 62.104.23.252 parents: gw-freenet hostgroups: computers, porterbox, sw-raid, lenny, puppet - bruckner: - address: 62.104.23.253 - parents: gw-freenet - hostgroups: computers, no-udev, porterbox, single-cpu, no-samhain raptor: address: 195.243.109.162 @@ -394,6 +390,10 @@ servers: address: 195.20.242.89 parents: gw-1und1-karlsruhe hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny, puppet + chopin: + address: 195.20.242.124 + parents: schumann + hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts caballero: address: 193.201.200.200 @@ -450,7 +450,7 @@ servers: agnesi: address: 65.173.90.83 parents: gw-agnesi - hostgroups: deadslow + hostgroups: deadslow, lenny spontini: address: 137.82.84.65 @@ -462,14 +462,14 @@ servers: parents: gw-ubc hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, puppet dijkstra: - address: 137.82.84.66 + address: 137.82.84.70 parents: gw-ubc - hostgroups: computers, bl460, rsyncd-hosts, acpid-hosts, lenny, puppet + hostgroups: computers, bl460, rsyslog-hosts, acpid-hosts, lenny, puppet lebrun: address: 193.198.184.10 parents: gw-carnet - hostgroups: computers, buildd + hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts, puppet schroeder: address: 193.198.184.11 parents: gw-carnet @@ -745,12 +745,12 @@ services: name: disk usage on /var servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var" - hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, tartini, morales, powell, escher + hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, tartini, morales, powell, escher - name: disk usage on /org servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org" - hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein + hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun - name: disk usage on /org servicegroups: diskspace @@ -760,7 +760,7 @@ services: name: disk usage on /srv servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv" - hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka + hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka, chopin - name: disk usage on /org/scratch servicegroups: diskspace @@ -780,7 +780,7 @@ services: name: disk usage on /home servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home" - hosts: raptor, voltaire, lebrun, rem, ball, paer, escher + hosts: raptor, voltaire, rem, ball, paer, escher - name: disk usage on /home servicegroups: diskspace @@ -949,7 +949,7 @@ services: check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3" depends: network service - sshd hostgroups: computers, deadslow - excludehosts: agnesi, crest, kullervo + excludehosts: crest, kullervo excludehostgroups: lenny normal_check_interval: 60 - @@ -963,10 +963,11 @@ services: check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5" depends: network service - sshd hostgroups: lenny + excludehosts: agnesi normal_check_interval: 60 - name: "network service - sshd - version - 2260" - check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch3" + check: "dsa_check_ssh_port_version!2260!OpenSSH_5.1p1 Debian-5" depends: network service - sshd - 2260 hosts: agnesi normal_check_interval: 60 @@ -1777,10 +1778,6 @@ 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 - debprivate-ftcollins.debian.org - check: "dsa_check_soas!debprivate-ftcollins.debian.org" - hosts: global - name: DNS SOA sync - debian.org check: "dsa_check_soas_add!samosa.debian.org!debian.org"