X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=a5d831b138775ed7ad84007261a7d9ad88d15bdd;hb=dd6195f7fb0fcd71f8ad705f20530aafb5b7f43e;hp=17d1f2066b0bf5307c8c714babf963a22efa0633;hpb=00f4a2fceeeb1d5fd22ed56dffed2ef2f25b7db7;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 17d1f20..a5d831b 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -113,10 +113,6 @@ servers: address: 140.211.166.1 parents: gw-ubcece hostgroups: layer3-infrastructure - gw-rapidswitch: - address: 193.201.200.129 - parents: gw-ubcece - hostgroups: layer3-infrastructure gw-sakura: address: 133.242.99.65 parents: gw-ubcece @@ -164,6 +160,10 @@ servers: hostgroups: notacomputer pingable: false check_command: dsa_check_always_ok + ubc-gateway: + address: 209.87.16.254 + parents: gw-ubcece + hostgroups: layer3-infrastructure # }}} # {{{ servers # {{{ gw-1und1 @@ -179,11 +179,6 @@ servers: address: 213.165.95.6 parents: powell hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie - piu-slave-1und1-01: - address: 213.165.95.7 - parents: powell - hostgroups: computers, service, kvmdomains, jessie - contacts: holger # }}} # {{{ gw-1und1-sec schumann: @@ -206,10 +201,10 @@ servers: hostgroups: computers, buildd, hassrvfs, jessie # }}} # {{{ gw-aql - etler: + eller: address: 141.170.6.156 parents: gw-aql - hostgroups: computers, porterbox, jessie, hassrvfs, hasbootfs, sw-raid + hostgroups: computers, porterbox, jessie, hassrvfs mips-aql-01: address: 141.170.6.149 parents: gw-aql @@ -289,7 +284,7 @@ servers: fasolo: address: 138.16.160.17 parents: gw-brown - hostgroups: computers, service, dl380, hpnewraid, jessie + hostgroups: computers, service, dl380, hpnewraid, jessie, hassrvfs, postgres94-hosts # }}} # {{{ gw-bytemark bm-bl1: @@ -445,10 +440,10 @@ servers: address: 5.153.231.25 parents: ganeti-bytemark hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https - oyens: + olin: address: 5.153.231.26 parents: ganeti-bytemark - hostgroups: computers, kvmdomains, jessie, openstack-controller, broken_mq, apache2-hosts # apache-https + hostgroups: computers, kvmdomains, jessie barriere: address: 5.153.231.27 parents: ganeti-bytemark @@ -521,10 +516,6 @@ servers: contacts: faw # }}} # {{{ gw-cecsit - gluck: - address: 150.203.164.38 - parents: gw-cecsit - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula, apache-https mirror-anu: address: 150.203.164.39 parents: gw-cecsit @@ -543,14 +534,6 @@ servers: hostgroups: secondary-IPs # }}} # {{{ gw-conova - sompek: - address: 217.196.149.225 - parents: gw-conova - hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc - stadler: - address: 217.196.149.226 - parents: gw-conova - hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc # }}} # {{{ gw-csail steffani: @@ -599,6 +582,10 @@ servers: address: 128.31.0.67 parents: ganeti-csail hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https + pkgmirror-csail: + address: 128.31.0.51 + parents: ganeti-csail + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs # }}} # {{{ gw-dgi storace: @@ -810,6 +797,10 @@ servers: address: 82.195.75.65 parents: ganeti3 hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https + mips-manda-01: + address: 82.195.75.66 + parents: gw-man-da + hostgroups: computers, buildd, jessie, hassrvfs mipsel-manda-01: address: 82.195.75.72 parents: gw-man-da @@ -818,6 +809,10 @@ servers: address: 82.195.75.74 parents: gw-man-da hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs + mipsel-manda-03: + address: 82.195.75.67 + parents: gw-man-da + hostgroups: computers, buildd, jessie, hassrvfs seger: address: 82.195.75.93 parents: ganeti3 @@ -860,21 +855,11 @@ servers: address: 140.211.166.198 parents: pieta hostgroups: computers, jessie, hassrvfs, porterbox - merulo: - address: 140.211.166.46 - parents: gw-osuosl - hostgroups: computers, porterbox, hasusrfs, wheezy partch: address: 140.211.15.152 parents: gw-osuosl hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid # }}} - # {{{ gs-rapidswitch - caballero: - address: 193.201.200.200 - parents: gw-rapidswitch - hostgroups: computers, buildd, sw-raid, wheezy, hassrvfs, acpid-hosts - # }}} # {{{ gw-sanger sibelius: address: 193.62.202.28 @@ -884,7 +869,7 @@ servers: smetana: address: 193.62.202.29 parents: gw-sanger - hostgroups: computers, porterbox, sw-raid, sparc, wheezy + hostgroups: computers, sw-raid, sparc, wheezy, no-bacula contacts: tjrc1, dave # }}} # {{{ gw-scanplus @@ -988,10 +973,6 @@ servers: parents: ganeti2 hostgroups: computers, freebsd, jessie, buildd, hassrvfs contacts: christoph - lucatelli: - address: 206.12.19.15 - parents: sw-ubcece-kais - hostgroups: computers, buildd, jessie # locke: # address: 206.12.19.120 # parents: sw-ubcece-kais @@ -1057,6 +1038,24 @@ servers: parents: ganeti2 hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server # }}} + # {{{ ubc-gateway + ubc-enc2bl1: + address: 209.87.16.1 + parents: ubc-gateway + hostgroups: computers, bl460, service, jessie, drbd-hosts, multipath-hosts, hpnewraid + ubc-enc2bl2: + address: 209.87.16.2 + parents: ubc-gateway + hostgroups: computers, bl460, service, jessie, drbd-hosts, multipath-hosts, hpnewraid + ubc-enc2bl9: + address: 209.87.16.9 + parents: ubc-gateway + hostgroups: computers, bl460, service, jessie, drbd-hosts, multipath-hosts, hpnewraid + ubc-enc2bl10: + address: 209.87.16.10 + parents: ubc-gateway + hostgroups: computers, bl460, service, jessie, drbd-hosts, multipath-hosts, hpnewraid + # }}} # {{{ gw-umn #saens: # address: 128.101.240.212 @@ -1341,9 +1340,6 @@ hostgroups: hasvarlogfs: alias: hosts with a /var/log filesystem private: 1 - hasusrfs: - alias: hosts with a /usr filesystem - private: 1 incomingmailrelayed: alias: incoming mail needs to go through a mail relay @@ -1463,16 +1459,11 @@ services: servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv" hostgroups: hassrvfs - - - name: disk usage on /usr - servicegroups: diskspace - nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr" - hostgroups: hasusrfs - name: disk usage on /var/lib/postgresql servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql" - hosts: sibelius, busoni, buxtehude, lw07 + hosts: sibelius, busoni, buxtehude, lw07, fasolo - name: disk usage on /var/log servicegroups: diskspace @@ -1522,7 +1513,7 @@ services: name: disk usage on /srv/ftp-master.debian.org servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /srv/ftp-master.debian.org" - hosts: franck + hosts: franck, fasolo - name: disk usage on /storage/snapshot-farm-1 servicegroups: diskspace @@ -1638,7 +1629,7 @@ services: servicegroups: backup nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup" hostgroups: computers - excludehosts: backuphost, storace, backuphost + excludehosts: backuphost, storace check_interval: 60 max_check_attempts: 2 retry_check_interval: 5 @@ -2416,7 +2407,7 @@ services: name: network service - http check: check_http hostgroups: apache2-hosts - excludehosts: klecker, oyens + excludehosts: klecker depends: process - apache2 - master - name: network service - http @@ -2615,7 +2606,7 @@ services: servicegroups: mirror - name: mirror static sync - network-test - check: "dsa_check_staticsync!network-test.debian.org" + check: "dsa_check_staticsync_nossl!network-test.debian.org" hosts: global servicegroups: mirror - @@ -2640,7 +2631,7 @@ services: servicegroups: mirror - name: mirror static sync - debdeltas - check: "dsa_check_staticsync!debdeltas.debian.net" + check: "dsa_check_staticsync_nossl!debdeltas.debian.net" hosts: global servicegroups: mirror - @@ -2655,17 +2646,17 @@ services: servicegroups: mirror - name: mirror static sync - mozilla - check: "dsa_check_staticsync!mozilla.debian.net" + check: "dsa_check_staticsync_nossl!mozilla.debian.net" hosts: global servicegroups: mirror - name: mirror static sync - news - check: "dsa_check_staticsync!news.debian.org" + check: "dsa_check_staticsync!news.debian.net" hosts: global servicegroups: mirror - name: mirror static sync - incoming.ports - check: "dsa_check_staticsync!incoming.ports.debian.org" + check: "dsa_check_staticsync_nossl!incoming.ports.debian.org" hosts: global servicegroups: mirror # - @@ -2705,17 +2696,17 @@ services: servicegroups: mirror - name: mirror static sync - incoming - check: "dsa_check_staticsync!incoming.debian.org" + check: "dsa_check_staticsync_nossl!incoming.debian.org" hosts: global servicegroups: mirror - name: mirror static sync - metadata.ftp-master - check: "dsa_check_staticsync!metadata.ftp-master.debian.org" + check: "dsa_check_staticsync_nossl!metadata.ftp-master.debian.org" hosts: global servicegroups: mirror - name: mirror static sync - deb - check: "dsa_check_staticsync!deb.debian.org" + check: "dsa_check_staticsync_nossl!deb.debian.org" hosts: global servicegroups: mirror