X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=93fe15a9edbaaf748a351d6103ee193dd802dd6d;hb=ec774afacd759d8b101ca172aa8f9fd1b97b0e6a;hp=0366f966c3f3f82c8ea8fe149e8e46da1bd2a743;hpb=112f7888237d00bdf10bb70935f1b162d8f87568;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0366f96..93fe15a 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -177,7 +177,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts, bind9-hosts
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
@@ -224,7 +224,7 @@ servers:
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs
+    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs, ulogd-hosts
     contacts: joerg, bzed
   #morales:
   #  address: 82.195.75.97
@@ -292,7 +292,7 @@ servers:
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, spamd, heavy-exim, highload
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, spamd, heavy-exim, highload, xinetd-hosts
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
@@ -449,7 +449,7 @@ servers:
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains, ulogd-hosts
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -524,7 +524,7 @@ servers:
   geo2:
     address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains, ulogd-hosts
   duarte:
     address: 206.12.19.114
     parents: dijkstra
@@ -630,6 +630,10 @@ servers:
     address: 130.239.18.121
     parents: gw-aca
     hostgroups: computers, buildd, hassrvfs
+  pettersson:
+    address: 130.239.18.123
+    parents: gw-aca
+    hostgroups: computers, hasbootfs, aacraid
 
   lafayette:
     address: 147.215.7.160
@@ -639,11 +643,11 @@ servers:
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, acpid-hosts, megaraid
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, ulogd-hosts
+    hostgroups: computers, acpid-hosts, ulogd-hosts, megaraid
   fasch:
     address: 194.177.211.201
     parents: rautavaara
@@ -753,6 +757,9 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
+  megaraid:
+    alias: Hosts with LSI Logic MegaRAID
+    private: 1
   single-cpu:
     alias: Hosts with only one CPU
     private: 1
@@ -1621,6 +1628,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-aacraid"
     hostgroups: aacraid
+ ###
+  -
+    name: RAID - megaraid
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megaraid"
+    hostgroups: megaraid
  ###
   -
     name: RAID - 3ware