X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=5490939c7004f39732a1e7319e7950ca818f462e;hb=f3f401396f032659d2a29c914b5df57140fad4cc;hp=aa8133ef016e0e5e2ab7b6208924e7c1b1d47f48;hpb=7e00e7390d9e30bf9a237fee19eea09b99e772f2;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index aa8133e..5490939 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -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
@@ -453,7 +453,7 @@ servers:
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
@@ -586,14 +586,6 @@ servers:
     parents: gw-bytemark
     hostgroups: notacomputer
 
-  falla:
-    address: 128.31.0.65
-    parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie, jessie-freebsd
-  fischer:
-    address: 128.31.0.35
-    parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
@@ -749,16 +741,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
@@ -860,10 +842,6 @@ servers:
     address: 140.211.166.197
     parents: pieta
     hostgroups: computers, hassrvfs, buildd, jessie
-  pizzetti:
-    address: 140.211.166.198
-    parents: pieta
-    hostgroups: computers, jessie, hassrvfs, porterbox
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
@@ -1006,7 +984,7 @@ servers:
   tye:
     address: 209.87.16.37
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ullmann:
     address: 209.87.16.38
     parents: ubc-gateway
@@ -1189,8 +1167,6 @@ hostgroups:
     alias: Hosts running wheezy
   jessie:
     alias: Hosts running jessie
-  jessie-freebsd:
-    alias: kFreebsd hosts running jessie
   stretch:
     alias: Hosts running stretch
 
@@ -1420,7 +1396,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: sibelius, busoni, buxtehude, lw07, fasolo
+    hosts: sibelius, buxtehude, lw07, fasolo
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1586,10 +1562,6 @@ services:
     hostgroups: computers
     excludehosts: zelenka, zandonai
     excludehostgroups: jessie, stretch
-  -
-    name: process - getty
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/getty"
-    hostgroups: jessie-freebsd
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
@@ -2082,12 +2054,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
     check_interval: 120
     hostgroups: bm-bl
-  -
-    name: HW - hpacucli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
-    check_interval: 120
-    hosts: busoni
   ###
 #  -
 #    name: HW - edac status
@@ -2147,7 +2113,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts, mail-relay
-    excludehosts: master, busoni, quantz, buxtehude
+    excludehosts: master, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
@@ -2157,11 +2123,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, busoni, quantz, buxtehude
+    excludehosts: master, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, busoni, quantz, buxtehude
+    hosts: master, quantz, buxtehude
   -
     name: mail queue
     nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
@@ -2231,7 +2197,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: bendel, busoni
+    excludehosts: bendel
 
   -
     name: unwanted process - greylistd
@@ -2983,3 +2949,5 @@ services:
 # }}}
 
 # vim: set ts=2 sw=2 et ai si fdm=marker:
+
+