X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=05b3156e3999711546cbf7d6a374fdb9c779a6a3;hb=9273113700f262a42e2605dab6744a7add5e4269;hp=c87065d2aafb875534713877be2143d87d28f4e1;hpb=27304ea558a7ad65486ff4b0a07c2a1407b7d88d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c87065d..05b3156 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -345,15 +345,6 @@ servers:
     parents: gw-ftcollins
     hostgroups: computers, buildd, hasbootfs, lenny
     contacts: dannf
-  paer:
-    address: 192.25.206.11
-    parents: gw-ftcollins
-    hostgroups: computers, porterbox, hasbootfs, hashomefs, lenny
-  peri:
-    address: 192.25.206.15
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
-    contacts: dannf
   samosa:
     address: 192.25.206.57
     parents: gw-ftcollins
@@ -472,6 +463,10 @@ servers:
     address: 82.195.75.89
     parents: czerny
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+  vento:
+    address: 82.195.75.98
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, heavy-exim
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
@@ -531,7 +526,7 @@ servers:
   buxtehude:
     address: 140.211.166.26
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, squeeze
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, squeeze, hasvarlogfs
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -633,7 +628,7 @@ servers:
   wagner:
     address: 217.196.43.132
     parents: gw-telegraaf2
-    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385, brokensamhain
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres91-hosts, apache-https, dl385, brokensamhain
     contact_groups: alioth-admins
   # }}}
   # {{{ gw-ubcece
@@ -806,7 +801,7 @@ servers:
   dukas:
     address: 206.12.19.128
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs, apache-https
   tye:
     address: 206.12.19.129
     parents: traetta
@@ -859,6 +854,10 @@ servers:
     address: 206.12.19.141
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, squeeze, postgres91-hosts, nfs-client, apache2-hosts, autofs
+  sonntag:
+    address: 206.12.19.142
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, squeeze, nfs-client, autofs, hassrvfs
   # }}}
   # {{{ gw-ugent
   ancina:
@@ -2399,11 +2398,6 @@ services:
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
   #  hostgroups: tftpd-hosts
  ###
-#  -
-#    name: process - dhcpd
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
-#    hosts: paer
- ###
 
  ############ NFS Stuff ############
  ####