tidy up moszumanska

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 06d2c2b..c8a5425 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -369,7 +369,7 @@ servers:
     address: 5.153.231.21
     parents: ganeti-bytemark
     contact_groups: alioth-admins
-    hostgroups: computers, general, wheezy, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain, no-bacula, bind9-hosts, xinetd-hosts
+    hostgroups: computers, general, wheezy, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain, no-bacula, bind9-hosts, xinetd-hosts, alioth, heavy-exim
     no-servicegroups: true
   dillon:
     address: 5.153.231.22
@@ -1192,6 +1192,9 @@ hostgroups:
   ping-suckers:
     alias: machines that just suck at icmp
     private: 1
+  alioth:
+    alias: machines that just are just awkward
+    private: 1
 
   security_mirror:
     alias: hosts that are security mirrors
@@ -1444,13 +1447,11 @@ 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
-    excludehosts: moszumanska
-    excludehostgroups: freebsd
+    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'"
-    excludehosts: moszumanska
     hostgroups: freebsd
 
  ####
@@ -1679,11 +1680,13 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: lotti
     hostgroups: computers
+    excludehostgroups: alioth
   -
     name: remote logging on lully
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: lully
     hostgroups: computers
+    excludehostgroups: alioth
   -
     name: MQ connection on rainier
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
@@ -1691,6 +1694,7 @@ services:
     hostgroups: computers
     normal_check_interval:  60
     retry_check_interval: 15
+    excludehostgroups: alioth
   -
     name: MQ connection on rapoport
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
@@ -1698,6 +1702,7 @@ services:
     hostgroups: computers
     normal_check_interval:  60
     retry_check_interval: 15
+    excludehostgroups: alioth
  ### MAIL STUFF
  ###
   -
@@ -1940,6 +1945,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
     normal_check_interval: 60
+    excludehostgroups: alioth
   -
     name: setup - local hostname etc-hosts
     nrpe: 'if getent ahosts `hostname` | grep -q 127.0; then echo "Warning: local hostname resolves to 127/8 address"; exit 1; else echo "OK: Hostname resolves to non-127/8 address."; exit 0; fi'
@@ -1967,6 +1973,7 @@ services:
     name: process - unbound
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'"
     hostgroups: unbound-hosts, squeeze, wheezy
+    excludehostgroups: alioth
  ###
   -
     name: process - uptimed
@@ -2049,7 +2056,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: squeeze,freebsd
+    excludehostgroups: squeeze, 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'"
@@ -2062,8 +2069,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
-    excludehosts: moszumanska
+    excludehostgroups: squeeze, alioth
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -2426,7 +2432,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
-    excludehostgroups: freebsd
+    excludehostgroups: freebsd, alioth
  ####
   -
     name: process - UPS - nut usbhid-ups - ups1