X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=43ed48c17717e9028ee45224d47ca583e15dd4f0;hb=9cfec428e6bc6cd4b6d09160fb91e7041505d0e0;hp=f844998ce5b3ec39aebf8ee4f841170afc72a5aa;hpb=7ba02ee57a0d9bbd3cd4dc9510a11df53ace399f;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f844998..43ed48c 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -139,7 +139,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-unicamp:
-    address: 177.220.10.129
+    address: 143.106.167.113
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-utwente:
@@ -238,15 +238,15 @@ servers:
   arm-arm-01:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
+    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq, sw-raid
   arm-arm-03:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
+    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq, sw-raid
   arm-arm-04:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
+    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq, sw-raid
   harris:
     address: 217.140.96.66
     parents: gw-arm
@@ -834,10 +834,6 @@ servers:
     address: 140.211.166.197
     parents: pieta
     hostgroups: computers, hassrvfs, buildd, jessie
-  partch:
-    address: 140.211.15.152
-    parents: gw-osuosl
-    hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid
   # }}}
   # {{{ gw-sanger
   sallinen:
@@ -853,11 +849,6 @@ servers:
     parents: gw-sanger
     hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server, varnish-hosts
     contacts: tjrc1, dave
-  smetana:
-    address: 193.62.202.29
-    parents: gw-sanger
-    hostgroups: computers, sw-raid, sparc, wheezy, no-bacula
-    contacts: tjrc1, dave
   # }}}
   # {{{ gw-scanplus
   lobos:
@@ -1029,19 +1020,19 @@ servers:
   # }}}
   # {{{ gw-unicamp
   prokofiev:
-    address: 177.220.10.140
+    address: 143.106.167.124
     parents: gw-unicamp
     hostgroups: computers, stretch, service, manyprocesses
   powerpc-unicamp-01:
-    address: 177.220.10.141
+    address: 143.106.167.120
     parents: prokofiev
     hostgroups: computers, hassrvfs, buildd, jessie
   ppc64el-unicamp-01:
-    address: 177.220.10.142
+    address: 143.106.167.121
     parents: prokofiev
     hostgroups: computers, hassrvfs, buildd, stretch
   plummer:
-    address: 177.220.10.143
+    address: 143.106.167.122
     parents: prokofiev
     hostgroups: computers, porterbox, hassrvfs, stretch
   # }}}
@@ -1153,8 +1144,6 @@ hostgroups:
     alias: Dell PowerEdge 1950 hosts
     private: 1
 
-  wheezy:
-    alias: Hosts running wheezy
   jessie:
     alias: Hosts running jessie
   stretch:
@@ -1841,7 +1830,7 @@ services:
     name: system time synced
     nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl -s"
     hostgroups: computers
-    excludehostgroups: systemd-timesyncd, wheezy
+    excludehostgroups: systemd-timesyncd
     servicegroups: time
   -
     name: system time synced
@@ -1858,7 +1847,7 @@ 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
-    excludehosts: harris, smetana
+    excludehosts: harris
   ###
   -
     name: process - cron
@@ -1941,7 +1930,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: wheezy, jessie, stretch
+    hostgroups: jessie, stretch
     excludehostgroups: alioth
   -
     name: process - stunnel4 - puppet-ekeyd is crazy
@@ -2008,18 +1997,11 @@ services:
     runfrom: handel
   # }}}
   # {{{ HW health/raid
-  -
-    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 --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
-    hostgroups: sw-raid
-    excludehostgroups: jessie, stretch
   -
     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