X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=cbf6c67c87c6de832e48837d8e33a286212a3ed8;hb=ecd1197ea218c3d3c81c9395e4edd4928d52b4af;hp=5091a948691722eb41d0f7926ba84204ff4ebeda;hpb=422f5fc863db0f8c035772a3f7fb6f56b9e1f09b;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5091a94..cbf6c67 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -170,11 +170,11 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, service, stretch
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hassrvfs, pe1950
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula, pe1950
   # }}}
   # {{{ gw-accumu
   pettersson:
@@ -379,7 +379,7 @@ servers:
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd, broken_https_default_vhost
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
@@ -403,7 +403,7 @@ servers:
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
   moszumanska:
     address: 5.153.231.21
     parents: ganeti-bytemark
@@ -421,7 +421,7 @@ servers:
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
@@ -458,18 +458,6 @@ servers:
     address: 5.153.231.36
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, systemd-timesyncd
-  mirror-bytemark:
-    address: 5.153.231.37
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, hassrvfs
-  mirror-bytemark-debian:
-    address: 5.153.231.45
-    hostgroups: secondary-IPs
-    parents: mirror-bytemark
-  mirror-bytemark-security:
-    address: 5.153.231.46
-    hostgroups: secondary-IPs
-    parents: mirror-bytemark
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
@@ -498,7 +486,7 @@ servers:
   casulana:
     address: 5.153.231.41
     parents: gw-bytemark
-    hostgroups: computers, service, stretch, hassrvfs, dl380, manyprocesses
+    hostgroups: computers, service, stretch, hassrvfs, dl380, manyprocesses, apache2-hosts
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -583,7 +571,7 @@ servers:
     hostgroups: computers, service, dl360, stretch, drbd-hosts
   ganeti-csail:
     address: 128.31.0.49
-    parents: gw-bytemark
+    parents: gw-csail
     hostgroups: notacomputer
 
   mirror-csail:
@@ -711,11 +699,19 @@ servers:
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
-    hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
+  lw09:
+    address: 185.17.185.181
+    parents: gw-leaseweb
+    hostgroups: computers, service, stretch, dl180
+  lw10:
+    address: 185.17.185.182
+    parents: gw-leaseweb
+    hostgroups: computers, service, stretch, dl180
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -741,16 +737,6 @@ servers:
     address: 82.195.75.110
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload
-  fils:
-    address: 82.195.75.89
-    parents: ganeti3
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
-  fayrfax:
-    address: 82.195.75.82
-    parents: ganeti3
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
   vento:
     address: 82.195.75.98
     parents: ganeti3
@@ -929,16 +915,6 @@ servers:
     address: 209.87.16.21
     parents: ubc-gateway
     hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
-  finzi:
-    address: 209.87.16.22
-    parents: ubc-gateway
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
-  fano:
-    address: 209.87.16.23
-    parents: ubc-gateway
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
   elgar:
     address: 209.87.16.24
     parents: ubc-gateway
@@ -1015,11 +991,11 @@ servers:
   godard:
     address: 209.87.16.44
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts, postgres96-hosts
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts, postgres96-hosts, manyprocesses
   debussy:
     address: 209.87.16.46
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1125,10 +1101,6 @@ hostgroups:
   notacomputer:
     alias: Systems that are not really systems.  Yeah :)
     private: 1
-  freebsd:
-    alias: freebsd
-    private: 1
-    extinfo-icon_image_alt: Debian GNU/kFreeBSD
   armhf:
     alias: armhf
     private: 1
@@ -1172,6 +1144,9 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
+  pe1950:
+    alias: Dell PowerEdge 1950 hosts
+    private: 1
 
   wheezy:
     alias: Hosts running wheezy
@@ -1550,14 +1525,6 @@ services:
     name: processes - total
     hostgroups: manyprocesses
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
-  -
-    name: swap usage - percent
-    nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%"
-    hostgroups: computers
-  -
-    name: swap usage - mb
-    nrpe: "/usr/lib/nagios/plugins/check_swap -w 20000 -c 5000"
-    hostgroups: computers
   -
     name: free memory - mb
     nrpe: "/usr/lib/nagios/plugins/dsa-check-memory -m mb"
@@ -1576,7 +1543,6 @@ services:
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
     hostgroups: jessie, stretch
-    excludehostgroups: freebsd
 
   -
     name: processes - zombies
@@ -1587,7 +1553,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy"
     event_handler: dsa_event_handler_restart_ekey
     hostgroups: computers
-    excludehostgroups: freebsd
   -
     name: system - filesystem check
     nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
@@ -1641,12 +1606,7 @@ services:
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: computers
-    excludehostgroups: freebsd, alioth
-  -
-    name: process - bacula-fd
-    servicegroups: backup
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
-    hostgroups: freebsd
+    excludehostgroups: alioth
 
   -
     name: network backup status - draghi
@@ -1683,9 +1643,8 @@ services:
   -
     name: upgraded libraries
     servicegroups: security
-    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs"
+    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs --ignore-younger=1h"
     hostgroups: computers
-    excludehostgroups: freebsd
     check_interval:  60
     retry_interval: 15
     notification_interval: 10080
@@ -1693,26 +1652,23 @@ services:
     name: installed firewall
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
     hostgroups: computers
-    excludehostgroups: freebsd
   -
     name: puppetized firewall
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf"
     hostgroups: computers
-    excludehostgroups: freebsd
   -
     name: process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
     hostgroups: computers
-    excludehostgroups: freebsd, sparc, jessie, stretch
+    excludehostgroups: sparc, jessie, stretch
   -
     name: process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ulog -C ulogd -a '/usr/sbin/ulogd --daemon --uid ulog'"
     hostgroups: jessie, stretch
-    excludehostgroups: freebsd
   -
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
-    hostgroups: freebsd, sparc
+    hostgroups: sparc
   ####
   -
     name: process - samhain
@@ -1740,16 +1696,11 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: computers
-    excludehostgroups: freebsd, jessie, stretch
-  -
-    name: process - syslog-ng
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
-    hostgroups: freebsd
+    excludehostgroups: jessie, stretch
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -F'"
     hostgroups: jessie, stretch
-    excludehostgroups: freebsd
 
   -
     name: remote logging on lotti
@@ -1807,11 +1758,6 @@ services:
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'"
     hostgroups: computers
-    excludehostgroups: freebsd
-  -
-    name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
-    hostgroups: freebsd
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1835,7 +1781,7 @@ services:
     name: system time synced
     nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl -s"
     hostgroups: computers
-    excludehostgroups: systemd-timesyncd, freebsd, wheezy
+    excludehostgroups: systemd-timesyncd, wheezy
     servicegroups: time
   -
     name: system time synced
@@ -1852,7 +1798,6 @@ services:
     name: process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
     hostgroups: computers
-    excludehostgroups: freebsd
     excludehosts: harris, smetana
   ###
   -
@@ -1864,11 +1809,7 @@ services:
     name: process - ud-replicated
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C ud-replicated -a '/usr/bin/python /usr/bin/ud-replicated'"
     hostgroups: computers
-    excludehostgroups: freebsd, alioth
-  -
-    name: process - ud-replicated
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C python2.7 -a '/usr/bin/python /usr/bin/ud-replicated'"
-    hostgroups: freebsd
+    excludehostgroups: alioth
   ###
   -
     name: process - monit
@@ -1915,16 +1856,11 @@ services:
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C udevd -a 'udevd'"
     hostgroups: computers
-    excludehostgroups: freebsd, jessie, stretch
+    excludehostgroups: jessie, stretch
   -
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C systemd-udevd -a '/lib/systemd/systemd-udevd'"
     hostgroups: jessie, stretch
-    excludehostgroups: freebsd
-  -
-    name: unexpected process - udev
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
-    hostgroups: freebsd
   ###
   -
     name: process - acpid
@@ -1951,19 +1887,13 @@ services:
     name: process - stunnel4 - puppet-ekeyd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
     hostgroups: wheezy, jessie, stretch
-    excludehostgroups: freebsd, alioth
+    excludehostgroups: alioth
   -
     name: process - stunnel4 - puppet-ekeyd is crazy
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity"
     hostgroups: computers
-    excludehostgroups: freebsd, alioth
+    excludehostgroups: alioth
     excludehosts: czerny, grnet-node01, storace
-  ###
-  -
-    name: process - rngd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd -a '/usr/sbin/rngd -r /dev/hwrng'"
-    hostgroups: kvmdomains
-    excludehostgroups: stretch
   # }}}
   # {{{ anti-services
   -
@@ -2114,6 +2044,10 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
+  -
+    name: HW - OpenManage status
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage"
+    hostgroups: pe1950
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2378,7 +2312,7 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: klecker
+    excludehosts: klecker, casulana
     depends: process - apache2 - master
   -
     name: network service - http
@@ -2467,18 +2401,11 @@ services:
     hosts: storace, backuphost
   # }}}
   # {{{ buildd
-  -
-    name: process - buildd
-    servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
-    hosts: fano, finzi, fils, fayrfax
-    contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    excludehosts: fano, finzi, fils, fayrfax
     contact_groups: buildd
   -
     name: processes - zombie schroot
@@ -2888,9 +2815,8 @@ services:
   # {{{ misc
   -
     name: system - all services running
-    nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-systemd-services"
     hostgroups: jessie, stretch
-    excludehostgroups: freebsd
   ###
   -
     name: process - slapd
@@ -2940,6 +2866,11 @@ services:
     check: dsa_check_cert!5061
     check_interval: 60
     hosts: vogler
+  -
+    name: freeradius process
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u freerad -C freeradius -a '/usr/sbin/freeradius -xx'"
+    check_interval: 60
+    hosts: vogler
   ####
   -
     name: puppetmaster cert
@@ -2959,3 +2890,5 @@ services:
 # }}}
 
 # vim: set ts=2 sw=2 et ai si fdm=marker:
+
+