From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 29 Nov 2014 08:53:59 +0000 (+0100)
Subject: Add mipsel-aql-0[12], lindsay, prokofiev
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=dc3ebdcb6931d217448d2c8702617610c73b83da;p=mirror%2Fdsa-nagios.git

Add mipsel-aql-0[12], lindsay, prokofiev
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a6aa89c..4858b99 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -227,6 +227,14 @@ servers:
     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
+  mipsel-aql-02:
+    address: 141.170.6.153
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs
   # }}}
   # {{{ gw-arm
   abel:
@@ -446,6 +454,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:
@@ -1005,9 +1017,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
@@ -1159,6 +1175,8 @@ hostgroups:
     alias: Hosts running squeeze
   wheezy:
     alias: Hosts running wheezy
+  jessie:
+    alias: Hosts running jessie
 
   kvmdomains:
     alias: Hosts that are KVM domains
@@ -1731,7 +1749,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
@@ -1849,7 +1867,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