X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=c3cc722be953e69040d1ccd3cd4f151d6d5477da;hb=e1e5c8e1eb5b7bda57504cc6a40f34efa2c83e26;hp=ffcd908c3076e10b92c5438f5c89be19dbcda194;hpb=da44ea1ef1b428e42bdbe15b8eff05fbe8d75770;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ffcd908..c3cc722 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -141,7 +141,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-cst:
-    address: 213.188.99.215
+    address: 213.157.2.210
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-isc:
@@ -202,12 +202,12 @@ servers:
   penalosa:
     address: 192.25.206.68
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hasbootfs, single-cpu
+    hostgroups: computers, buildd, hasbootfs, single-cpu, ulogd-hosts
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, ulogd-hosts
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
@@ -219,18 +219,13 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts
+    hostgroups: computers, buildd, acpid-hosts, ulogd-hosts
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
     hostgroups: computers, service, dl385, bind9-hosts, hasvarfs, ulogd-hosts
     contacts: joerg, bzed
-  #morales:
-  #  address: 82.195.75.97
-  #  parents: gw-man-da
-  #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, hasvarfs, hasusrfs
-  #  contacts: bzed
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
@@ -283,7 +278,7 @@ servers:
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, no-udev, hasbootfs, hashomefs, ntpsuckers
+    hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers, ulogd-hosts
   purcell:
     address: 82.195.75.69
     parents: gw-man-da
@@ -296,7 +291,7 @@ servers:
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, ulogd-hosts
 
 
   ries:
@@ -307,11 +302,11 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
@@ -349,7 +344,7 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, ulogd-hosts
   #mahler:
   #  address: 128.31.0.46
   #  parents: gw-mit-csail
@@ -380,7 +375,7 @@ servers:
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs, ulogd-hosts
     contacts: bzed
 
   widor:
@@ -404,7 +399,7 @@ servers:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers, hassrvfs, ulogd-hosts
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
@@ -420,7 +415,7 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, hasvarfs, hashomefs
+    hostgroups: computers, buildd, hasvarfs, hashomefs, ulogd-hosts
     contacts: sfrost
 
   puccini:
@@ -458,7 +453,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, no-udev, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, ulogd-hosts
 
   pescetti:
     address: 217.114.76.85
@@ -485,7 +480,7 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts
+    hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, ulogd-hosts
     contacts: luk
 
   agnesi:
@@ -552,7 +547,7 @@ servers:
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
@@ -601,7 +596,7 @@ servers:
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, hashomefs
+    hostgroups: computers, buildd, hasbootfs, hashomefs, ulogd-hosts
 
   zelenka:
     address: 80.245.147.40
@@ -610,7 +605,7 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs
+    hostgroups: computers, buildd, hassrvfs, ulogd-hosts
 
   escher:
     address: 213.188.99.215
@@ -624,12 +619,12 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs, xinetd-hosts, ulogd-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, hassrvfs
+    hostgroups: computers, buildd, hassrvfs, ulogd-hosts
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
@@ -638,7 +633,7 @@ servers:
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
-    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs, ulogd-hosts
 
   grieg:
     address: 194.177.211.200
@@ -660,11 +655,11 @@ servers:
   barber:
     address: 194.177.211.203
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
@@ -694,7 +689,7 @@ servers:
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid
+    hostgroups: computers, hasbootfs, aacraid, ulogd-hosts
 
 
 #############################
@@ -776,10 +771,6 @@ hostgroups:
     alias: Hosts running squeeze
     private: 1
 
-  no-samhain:
-    alias: hosts not running samhain properly
-    private: 1
-
   kvmdomains:
     alias: Hosts that are KVM domains
     private: 1
@@ -1103,13 +1094,11 @@ services:
     name: process - samhain
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
     hostgroups: computers
-    excludehostgroups: no-samhain
   -
     name: samhain
     servicegroups: samhain
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
     hostgroups: computers
-    excludehostgroups: no-samhain
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5