X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=76851cee8b0720462c319b5c6e3994dff3682778;hb=fc46a1a8996bf427d3f58ce2d43a2d033c58b629;hp=210245e76c85dabb61cc2768cafb595e6773b07f;hpb=3c0e113e1470739e24c968efd1b037f1e9a97442;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 210245e..76851ce 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -98,6 +98,10 @@ servers:
     address: 193.201.200.129
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-grnet:
+    address: 194.177.211.193
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
     parents: gw-HP-ftc
@@ -558,6 +562,14 @@ servers:
     # unless we implement runfrom for host alive checks
     pingable: false
     check_command: dsa_check_always_ok
+  fano:
+    address: 206.12.19.110
+    parents: luchesi
+    hostgroups: freebsd
+  finzi:
+    address: 206.12.19.111
+    parents: luchesi
+    hostgroups: freebsd
 
   lebrun:
     address: 193.198.184.10
@@ -587,17 +599,16 @@ servers:
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs, ntpsuckers
 
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
     hostgroups: computers, porterbox, lenny, hassrvfs
-  
   zandonai:
     address: 80.245.147.46
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, lenny, hassrvfs
 
   escher:
     address: 213.188.99.215
@@ -606,7 +617,7 @@ servers:
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny
+    hostgroups: computers, single-cpu, hasbootfs, lenny, ntpsuckers
 
   schein:
     address: 149.20.20.6
@@ -616,13 +627,62 @@ servers:
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, lenny, hassrvfs
 
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
     hostgroups: computers, buildd, lenny, sw-raid, hassrvfs, hasbootfs
 
+  grieg:
+    address: 194.177.211.200
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  rautavaara:
+    address: 194.177.211.199
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  fasch:
+    address: 194.177.211.201
+    parents: gw-grnet
+    hostgroups: freebsd
+  holter:
+    address: 194.177.211.202
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  barber:
+    address: 194.177.211.203
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts, buildd, hassrvfs
+  biber:
+    address: 194.177.211.204
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts, buildd, hassrvfs
+  cilea:
+    address: 194.177.211.205
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  vitry:
+    address: 194.177.211.206
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  krenek:
+    address: 194.177.211.207
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  scelsi:
+    address: 194.177.211.208
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  orff:
+    address: 194.177.211.209
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  field:
+    address: 194.177.211.210
+    parents: gw-grnet
+    hostgroups: freebsd
+
 #############################
 # host groups
 #
@@ -644,6 +704,10 @@ hostgroups:
     alias: Systems too slow to run any real checks
   dialup:
     alias: Systems with slow network
+  freebsd:
+    # no nrpe yet
+    alias: freebsd
+    private: 1
 
   porterbox:
     alias: developer accessible porter machines
@@ -1133,19 +1197,19 @@ services:
     # etch: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ntp -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
-    excludehosts: zelenka, zandonai
+    excludehosts: zelenka
   -
     name: network service - ntp
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: zelenka, ancina, zandonai
+    excludehosts: zelenka, ancina
     excludehostgroups: ntpsuckers
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: zelenka, ancina, zandonai
+    hosts: zelenka, ancina
     depends: process - xinetd
 
  ###
@@ -1589,13 +1653,13 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: zelenka, ancina, draghi, zandonai
+    hosts: zelenka, ancina, draghi
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: zelenka, ancina, draghi, zandonai
+    excludehosts: zelenka, ancina, draghi
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1907,6 +1971,10 @@ services:
     name: mirror sync - security
     check: "dsa_check_mirrorsync!security-nagios.debian.org!project/trace/security-master.debian.org"
     hosts: global
+  -
+    name: mirror sync - volatile
+    check: "dsa_check_mirrorsync!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org"
+    hosts: global
   -
     name: mirror sync - packages
     check: "dsa_check_mirrorsync!packages.debian.org!Pics/.trace"