X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=8afbf2b2d257a029f74a97ecfcb3176adbbf834a;hb=f993a5a0a0b6049e0b05d2777dfa127d6587321d;hp=84e90940bb864215b990ca4c691cc2cc5ecc5f45;hpb=d8fef204d9e3099a9b04e77fb430c6b88f4c2e1c;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 84e9094..8afbf2b 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -19,11 +19,6 @@ servers: hostgroups: notacomputer pingable: false check_command: dsa_check_always_ok - gw-1und1: - parents: gw-ubcece - hostgroups: notacomputer - pingable: false - check_command: dsa_check_always_ok gw-1und1-sec: parents: gw-ubcece hostgroups: notacomputer @@ -82,7 +77,7 @@ servers: parents: gw-ubcece hostgroups: layer3-infrastructure gw-isc: - address: 149.20.20.1 + address: 149.20.65.129 parents: gw-ubcece hostgroups: layer3-infrastructure gw-karlsruhe: @@ -166,12 +161,6 @@ servers: hostgroups: layer3-infrastructure # }}} # {{{ servers - # {{{ gw-1und1 - powell: - address: 87.106.64.223 - parents: gw-1und1 - hostgroups: computers, service, jessie - # }}} # {{{ gw-1und1-sec schumann: address: 212.227.126.54 @@ -536,11 +525,6 @@ servers: hostgroups: computers, jessie, service, sw-raid # }}} # {{{ gw-csail - steffani: - address: 128.31.0.36 - parents: gw-csail - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula - csail-node01: address: 128.31.0.16 parents: gw-csail @@ -565,31 +549,31 @@ servers: mirror-csail: address: 128.31.0.62 parents: ganeti-csail - hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https + hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https, systemd-timesyncd x86-csail-01: address: 128.31.0.50 parents: ganeti-csail - hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie + hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd x86-csail-02: address: 128.31.0.68 parents: ganeti-csail - hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie + hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd httpredir-csail-01: address: 128.31.0.66 parents: ganeti-csail - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, systemd-timesyncd soriano: address: 128.31.0.67 parents: ganeti-csail - hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https + hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https, systemd-timesyncd pkgmirror-csail: address: 128.31.0.51 parents: ganeti-csail - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd usper: address: 128.31.0.69 parents: ganeti-csail - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, xinetd-hosts, queued + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, xinetd-hosts, queued, systemd-timesyncd # }}} # {{{ gw-dgi storace: @@ -616,10 +600,6 @@ servers: address: 194.177.211.196 parents: gw-grnet hostgroups: computers, service, dl380, jessie, drbd-hosts - rautavaara: - address: 194.177.211.199 - parents: gw-grnet - hostgroups: computers, megaraid, service, jessie loghost-grnet-01: address: 194.177.211.200 parents: gw-grnet @@ -652,26 +632,26 @@ servers: address: 194.177.211.207 parents: ganeti-grnet hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-hosts, xinetd-hosts + melartin: + address: 194.177.211.208 + parents: ganeti-grnet + hostgroups: computers, service, kvmdomains, jessie # }}} # {{{ gw-isc - schein: - address: 149.20.20.6 - parents: gw-isc - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula mirror-isc: - address: 149.20.20.7 + address: 149.20.4.13 parents: gw-isc hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror mirror-isc2: - address: 149.20.20.19 + address: 149.20.4.14 parents: mirror-isc hostgroups: secondary-IPs mirror-isc3: - address: 149.20.20.22 + address: 149.20.4.15 parents: mirror-isc hostgroups: secondary-IPs mirror-isc-syncproxy: - address: 149.20.20.21 + address: 149.20.4.16 parents: mirror-isc hostgroups: secondary-IPs # }}} @@ -972,19 +952,19 @@ servers: ubc-enc2bl01: address: 209.87.16.1 parents: ubc-gateway - hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid + hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid ubc-enc2bl02: address: 209.87.16.2 parents: ubc-gateway - hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid + hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid ubc-enc2bl09: address: 209.87.16.9 parents: ubc-gateway - hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid + hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid ubc-enc2bl10: address: 209.87.16.10 parents: ubc-gateway - hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid + hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid rachmaninoff: address: 209.87.16.20 parents: ubc-gateway @@ -1228,6 +1208,9 @@ hostgroups: bl460: alias: HP BL460 blades private: 1 + bl460g8: + alias: HP BL460 Gen8 blades + private: 1 bm-bl: alias: HP blades at bytemark private: 1 @@ -1243,9 +1226,6 @@ hostgroups: aacraid: alias: Hosts with Adaptec AACraid private: 1 - megaraid: - alias: Hosts with LSI Logic MegaRAID - private: 1 wheezy: alias: Hosts running wheezy @@ -1351,9 +1331,6 @@ hostgroups: hassrvfs: alias: hosts with a /srv filesystem private: 1 - hasorgfs: - alias: hosts with a /org filesystem - private: 1 hasvarlogfs: alias: hosts with a /var/log filesystem private: 1 @@ -1466,11 +1443,6 @@ services: servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot" hostgroups: hasbootfs - - - name: disk usage on /org - servicegroups: diskspace - nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org" - hostgroups: hasorgfs - name: disk usage on /srv servicegroups: diskspace @@ -1556,6 +1528,16 @@ services: servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/morgue.debian.org" hosts: lw03 + - + name: disk usage on /srv/QNAP-big/ + servicegroups: diskspace + nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-big" + hosts: storace + - + name: disk usage on /srv/QNAP-tiny + servicegroups: diskspace + nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-tiny" + hosts: storace # }}} # {{{ ### system # {{{ setup @@ -1865,7 +1847,7 @@ services: depends: process - ntpd servicegroups: time - - name: process - ntpd + name: system time synced nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl" hostgroups: systemd-timesyncd servicegroups: time @@ -2075,8 +2057,8 @@ services: servicegroups: raid nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli" check_interval: 120 - hostgroups: dl380, dl360, bl460, dl180 - excludehosts: schein, busoni + hostgroups: dl380, dl360, bl460, bl460g8, dl180 + excludehosts: busoni excludehostgroups: hpnewraid - name: HW - hpacucli status @@ -2089,7 +2071,7 @@ services: servicegroups: raid nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery" check_interval: 120 - hosts: schein, busoni + hosts: busoni - name: HW - hpacucli enclosure status servicegroups: raid @@ -2108,13 +2090,13 @@ services: # nrpe: "/usr/lib/nagios/plugins/dsa-check-edac" # check_interval: 120 #hostgroups: computers - #excludehosts: villa, lobos, schein + #excludehosts: villa, lobos - name: HW - hpasmcli status nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm" check_interval: 120 hostgroups: dl380, dl360, bl460, bm-bl - excludehosts: villa, lobos, schein, storace, mirror-anu + excludehosts: villa, lobos, storace, mirror-anu - name: HW - hpasmcli status nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant" @@ -2125,11 +2107,6 @@ services: nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant --ignore-failed='PS2'" check_interval: 120 hosts: lobos - - - name: HW - hpasmcli status - nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant" - check_interval: 120 - hosts: schein - name: HW - hpasmcli status nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present" @@ -2141,24 +2118,12 @@ services: check_interval: 120 hosts: mirror-anu ### - - - name: RAID - 3ware - servicegroups: raid - nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware" - hosts: powell - ### - name: RAID - aacraid servicegroups: raid nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-aacraid" hostgroups: aacraid ### - - - name: RAID - megaraid - servicegroups: raid - nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megaraid" - hostgroups: megaraid - ### - name: RAID - DRBD servicegroups: raid