X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=0c7916e95b5d3d3bebfeb52eb2aceed022bd633e;hb=e03ca59629e2ec5cd442d4a3e58c6dfb04671e14;hp=be41f216864f63191b06ce8329283fa58b080ad4;hpb=e8acea88673203d9ba33d517adafbbbb93be36fe;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index be41f21..0c7916e 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -160,8 +160,7 @@ servers: hostgroups: layer3-infrastructure gw-ynic: # really janet, because ynic is stupid about firewalling - #address: 146.97.42.26 - address: 146.97.41.66 + address: 146.97.71.46 parents: gw-ubcece hostgroups: layer3-infrastructure gw-zivit: @@ -226,6 +225,14 @@ servers: address: 141.170.6.150 parents: gw-aql hostgroups: computers, buildd, jessie, nfs-client + mips-aql-04: + address: 141.170.6.154 + parents: gw-aql + hostgroups: computers, buildd, jessie, nfs-client + mips-aql-05: + address: 141.170.6.155 + parents: gw-aql + hostgroups: computers, buildd, jessie, nfs-client minkus: address: 141.170.6.151 parents: gw-aql @@ -383,18 +390,14 @@ servers: address: 5.153.231.13 parents: ganeti-bytemark hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts - couper: - address: 5.153.231.14 - parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs rainier: address: 5.153.231.16 parents: ganeti-bytemark - hostgroups: computers, kvmdomains, wheezy + hostgroups: computers, kvmdomains, jessie rapoport: address: 5.153.231.15 parents: ganeti-bytemark - hostgroups: computers, kvmdomains, wheezy + hostgroups: computers, kvmdomains, jessie delfin: address: 5.153.231.17 parents: ganeti-bytemark @@ -410,7 +413,7 @@ servers: donizetti: address: 5.153.231.20 parents: ganeti-bytemark - hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs + hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs moszumanska: address: 5.153.231.21 parents: ganeti-bytemark @@ -432,7 +435,7 @@ servers: oyens: address: 5.153.231.26 parents: ganeti-bytemark - hostgroups: computers, kvmdomains, jessie, apache2-hosts, openstack-controller, apache-https, broken_mq + hostgroups: computers, kvmdomains, jessie, openstack-controller, broken_mq #, apache2-hosts, apache-https barriere: address: 5.153.231.27 parents: ganeti-bytemark @@ -479,11 +482,15 @@ servers: mekeel: address: 5.153.231.40 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs pittar: address: 5.153.231.41 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs #, apache2-hosts + pinel: + address: 5.153.231.42 + parents: ganeti-bytemark + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim # }}} # {{{ gw-c3sl santoro: @@ -557,6 +564,10 @@ servers: address: 128.31.0.66 parents: ganeti-csail hostgroups: computers, service, kvmdomains, jessie, apache2-hosts + soriano: + address: 128.31.0.67 + parents: ganeti-csail + hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts # }}} # {{{ gw-dgi storace: @@ -658,10 +669,6 @@ servers: contacts: pkern # }}} # {{{ gw-man-da - ball: - address: 82.195.75.70 - parents: gw-man-da - hostgroups: computers, buildd, hasbootfs, wheezy, sw-raid # bartok TODO czerny: address: 82.195.75.109 @@ -716,7 +723,7 @@ servers: handel: address: 82.195.75.104 parents: ganeti3 - hostgroups: computers, service, kvmdomains, apache2-hosts, jessie, apache-https + hostgroups: computers, service, kvmdomains, apache2-hosts, jessie kaufmann: address: 82.195.75.107 parents: ganeti3 @@ -777,6 +784,18 @@ servers: address: 140.211.166.26 parents: byrd hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres94-hosts, jessie, hasvarlogfs, apache-https, spamd + pieta: + address: 140.211.166.195 + parents: gw-osuosl + hostgroups: computers, jessie, service + ppc64el-osuosl-01: + address: 140.211.166.196 + parents: pieta + hostgroups: computers, hassrvfs, buildd, jessie + powerpc-osuosl-01: + address: 140.211.166.197 + parents: pieta + hostgroups: computers, hassrvfs, buildd, jessie # malo TODO mayer: address: 140.211.166.78 @@ -790,10 +809,6 @@ servers: address: 140.211.166.46 parents: gw-osuosl hostgroups: computers, porterbox, hasusrfs, wheezy - parry: - address: 140.211.15.153 - parents: gw-osuosl - hostgroups: computers, jessie, buildd, hassrvfs, sw-raid partch: address: 140.211.15.152 parents: gw-osuosl @@ -905,7 +920,7 @@ servers: tchaikovsky: address: 206.12.19.118 parents: ganeti2 - hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, jessie + hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie brahms: address: 206.12.19.115 parents: ganeti2 @@ -955,7 +970,7 @@ servers: lotti: address: 206.12.19.121 parents: ganeti2 - hostgroups: computers, service, hasbootfs, kvmdomains, jessie, hassrvfs + hostgroups: computers, service, kvmdomains, jessie, hassrvfs nono: address: 206.12.19.123 parents: ganeti2 @@ -991,15 +1006,11 @@ servers: diabelli: address: 206.12.19.136 parents: ganeti2 - hostgroups: computers, service, hasbootfs, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost bizet: address: 206.12.19.137 parents: ganeti2 hostgroups: computers, service, kvmdomains, jessie, hassrvfs, no-bacula - popov: - address: 206.12.19.119 - parents: ganeti2 - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim beach: address: 206.12.19.140 parents: ganeti2 @@ -1037,11 +1048,11 @@ servers: powerpc-unicamp-01: address: 143.106.167.149 parents: prokofiev - hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie + hostgroups: computers, hassrvfs, buildd, jessie ppc64el-unicamp-01: address: 143.106.167.135 parents: prokofiev - hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie + hostgroups: computers, hassrvfs, buildd, jessie plummer: address: 143.106.167.146 parents: prokofiev @@ -1103,7 +1114,7 @@ servers: zandonai: address: 80.245.147.46 parents: gw-zivit - hostgroups: computers, buildd, hassrvfs, wheezy + hostgroups: computers, buildd, hassrvfs, jessie zelenka: address: 80.245.147.40 parents: gw-zivit @@ -1386,13 +1397,13 @@ services: - name: disk usage - all servicegroups: diskspace - nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2% -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount'" + nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2% -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -X nfs4 --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount|/proc/sys/fs/binfmt_misc'" hostgroups: computers excludehosts: sibelius - name: disk usage - all servicegroups: diskspace - nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x /srv/farm-snapshot/farm-misc 95 98" + nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x nfs4 -x /srv/farm-snapshot/farm-misc 95 98" hosts: sibelius - @@ -1476,9 +1487,9 @@ services: nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4" hosts: sibelius - - name: disk usage on /var/lib/postgresql/9.1 + name: disk usage on /var/lib/postgresql/9.4 servicegroups: diskspace - nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.1" + nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.4" hosts: franck - name: disk usage on /srv/ftp-master.debian.org @@ -2596,7 +2607,7 @@ services: hosts: giustini - name: event log - remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=9966 $HOSTADDRESS$ public" + remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=10791 $HOSTADDRESS$ public" runfrom: ubc-bl8 hosts: giustini # }}} @@ -2651,13 +2662,11 @@ services: hostgroups: openstack-controller # }}} # {{{ misc -# - -# Disable this check until logind and binfmt_misc issues are fixed -# something unknown is triggering mount of binfmt_misc -# https://bugs.debian.org/772700 -# name: system - all services running -# nrpe: "/usr/bin/sudo /bin/systemctl is-system-running" -# hostgroups: jessie + - + name: system - all services running + nrpe: "/usr/bin/sudo /bin/systemctl is-system-running" + hostgroups: jessie + excludehostgroups: freebsd ### - name: process - rngd @@ -2700,7 +2709,7 @@ services: ### - name: process - icinga - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'" + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:60 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'" hosts: tchaikovsky ### -