X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f1395d6ea49604b042a866f589d771632b17acee;hb=464fe42fb4f62ba78f02055dc36aca720c419bf0;hp=64483e14c5495a8ab2af1b5106589d6a5fd3524a;hpb=c9dce0cd5a57de9747ec264141097982c22c8f72;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 64483e1..f1395d6 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -34,7 +34,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-aql:
-    address: 141.170.6.145
+    address: 141.170.2.17
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-bytemark:
@@ -118,6 +118,10 @@ servers:
     address: 193.201.200.129
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-sakura:
+    address: 133.242.99.65
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-sanger:
     address: 193.62.202.20
     parents: gw-ubcece
@@ -219,10 +223,22 @@ servers:
     hostgroups: computers, buildd, hassrvfs, wheezy
   # }}}
   # {{{ gw-aql
+  mips-aql-01:
+    address: 141.170.6.149
+    parents: gw-aql
+    hostgroups: computers, buildd, wheezy
   mips-aql-02:
     address: 141.170.6.150
     parents: gw-aql
     hostgroups: computers, buildd, wheezy
+  mipsel-aql-01:
+    address: 141.170.6.152
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid
+  mipsel-aql-02:
+    address: 141.170.6.153
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid
   # }}}
   # {{{ gw-arm
   abel:
@@ -253,6 +269,10 @@ servers:
     address: 217.140.96.71
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, broken_mq
+  ia64-arm-01:
+    address: 217.140.96.61
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd, broken_mq, sw-raid, acpid-hosts
   # }}}
   # {{{ gw-brown
   franck:
@@ -355,11 +375,7 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts
-  backuphost:
-    address: 5.153.231.12
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
@@ -442,6 +458,10 @@ servers:
     address: 5.153.231.35
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+  lindsay:
+    address: 5.153.231.36
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -544,7 +564,7 @@ servers:
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, squeeze, nfs-server
+    hostgroups: computers, acpid-hosts, megaraid, service, wheezy
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
@@ -652,10 +672,6 @@ servers:
     address: 82.195.75.99
     parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs
-  rem:
-    address: 82.195.75.68
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, no-bacula
   draghi:
     address: 82.195.75.106
     parents: ganeti3
@@ -696,6 +712,10 @@ servers:
     address: 82.195.75.92
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy
+  wolkenstein:
+    address: 82.195.75.65
+    parents: ganeti3
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
@@ -857,10 +877,6 @@ servers:
     address: 206.12.19.118
     parents: ganeti2
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
-  wolkenstein:
-    address: 206.12.19.116
-    parents: ganeti2
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
   brahms:
     address: 206.12.19.115
     parents: ganeti2
@@ -1005,9 +1021,13 @@ servers:
     address: 143.106.167.145
     parents: gw-unicamp
     hostgroups: layer3-infrastructure
+  prokofiev:
+    address: 143.106.167.147
+    parents: gw-unicamp
+    hostgroups: computers, jessie, acpid-hosts, service
   powerpc-unicamp-01:
     address: 143.106.167.149
-    parents: asgard
+    parents: prokofiev
     hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
   # }}}
   # {{{ gw-utwente
@@ -1072,6 +1092,11 @@ servers:
     parents: gw-zivit
     hostgroups: computers, porterbox, hassrvfs, wheezy
   # }}}
+  # {{{ gw-sakura
+  setoguchi:
+    address: 133.242.99.74
+    parents: gw-sakura
+    hostgroups: computers, service, wheezy, no-bacula
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1159,6 +1184,8 @@ hostgroups:
     alias: Hosts running squeeze
   wheezy:
     alias: Hosts running wheezy
+  jessie:
+    alias: Hosts running jessie
 
   kvmdomains:
     alias: Hosts that are KVM domains
@@ -1535,6 +1562,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
     excludehosts: zelenka, zandonai
+    excludehostgroups: jessie
+  -
+    name: process - getty
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
+    hostgroups: computers
+    hostgroups: jessie
   -
     name: processes - zombies
     nrpe: "/usr/lib/nagios/plugins/check_procs 5 10 -s Z"
@@ -1558,7 +1591,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: backuphost, storace
+    excludehosts: storace
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1566,7 +1599,7 @@ services:
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: backuphost, storace
+    hosts: storace
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1635,7 +1668,12 @@ services:
     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
+    excludehostgroups: freebsd, sparc, jessie
+  -
+    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
+    excludehostgroups: freebsd
   -
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
@@ -1731,7 +1769,7 @@ 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: wheezy
+    hostgroups: wheezy, jessie
     excludehostgroups: freebsd
   -
     name: network service - munin-node
@@ -1779,7 +1817,7 @@ services:
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
-    excludehostgroups: squeeze, alioth
+    excludehostgroups: squeeze, alioth, jessie
   ###
   -
     name: MQ connection on rainier
@@ -1820,7 +1858,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
+    excludehostgroups: freebsd, jessie
+  -
+    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
   -
     name: unexpected process - udev
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
@@ -1849,7 +1891,7 @@ 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: squeeze, wheezy
+    hostgroups: squeeze, wheezy, jessie
     excludehostgroups: freebsd, alioth
   # }}}
   # {{{ anti-services
@@ -1897,6 +1939,13 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
+    excludehostgroups: jessie
+  -
+    name: process - mdadm monitor
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --scan'"
+    hostgroups: sw-raid
+    excludehostgroups: wheezy
   -
     name: RAID - sw raid
     servicegroups: raid
@@ -2615,6 +2664,17 @@ services:
     hosts: gombert
     contact_groups: gobby
   ####
+  -
+    name: network service - sip-tls cert - 443
+    check: dsa_check_cert!443
+    normal_check_interval: 60
+    hosts: vogler
+  -
+    name: network service - sip-tls cert - 5061
+    check: dsa_check_cert!5061
+    normal_check_interval: 60
+    hosts: vogler
+  ####
   -
     name: puppetmaster cert
     nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"