X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=12a720319d30f6585e7062530eca1d28558a2a02;hb=2848267bb9f62294b0434a599cddd7a82d08df2b;hp=ca0cf589bf4e3aef2c100dc4fceae3ef936e0d82;hpb=e38d9f67d87358d8257b364489f85b11a20d6f21;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ca0cf58..12a7203 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -103,14 +103,24 @@ servers:
   #  parents: gw-ubcece
   #  hostgroups: layer3-infrastructure
   sw-ubcece:
-    parents: tchaikovsky
     hostgroups: layer2-infrastructure
     contacts: lfilipoz
     pingable: false
     check_command: dsa_check_always_ok
+  sw-ubcece-mcld:
+    hostgroups: layer2-infrastructure
+    parents: sw-ubcece
+    contacts: lfilipoz
+    pingable: false
+    check_command: dsa_check_always_ok
+  sw-ubcece-kais:
+    hostgroups: layer2-infrastructure
+    parents: sw-ubcece
+    contacts: lfilipoz
+    pingable: false
+    check_command: dsa_check_always_ok
   gw-ubcece:
     address: 206.12.19.254
-    parents: tchaikovsky
     hostgroups: layer3-infrastructure
     contacts: lfilipoz
   gw-carnet:
@@ -493,23 +503,24 @@ servers:
 
   spontini:
     address: 206.12.19.14
-    parents: sw-ubcece
+    parents: sw-ubcece-mcld
     hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs
   dijkstra:
     address: 206.12.19.218
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
   luchesi:
     address: 206.12.19.214
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
   tchaikovsky:
     address: 206.12.19.118
+    parents: luchesi
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, squeeze
   wolkenstein:
     address: 206.12.19.116
@@ -533,27 +544,27 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts, service, lenny
   bellini:
     address: 206.12.19.7
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts, squeeze, autofs
   morricone:
     address: 206.12.19.9
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
   stabile:
     address: 206.12.19.13
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
   paganini:
     address: 206.12.19.10
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, squeeze, autofs
   respighi:
     address: 206.12.19.11
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, squeeze
   vivaldi:
     address: 206.12.19.12
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
   # MSA 2000 (2012i)
   giustini:
@@ -573,35 +584,35 @@ servers:
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
   gabrielli:
     address: 206.12.19.17
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, porterbox, squeeze
   corelli:
     address: 206.12.19.16
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, buildd, squeeze
   lucatelli:
     address: 206.12.19.15
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, buildd, squeeze
   rossini:
     address: 206.12.19.19
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
   salieri:
     address: 206.12.19.20
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
   traetta:
     address: 206.12.19.21
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
 #  locke:
 #    address: 206.12.19.120
-#    parents: sw-ubcece
+#    parents: sw-ubcece-kais
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
   lotti:
     address: 206.12.19.121
-    parents: sw-ubcece
+    parents: sw-ubcece-kais
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
   quantz:
     address: 206.12.19.122
@@ -900,12 +911,12 @@ hostgroups:
     alias: computers
     private: 1
   layer2-infrastructure:
-    alias: layer 2 devices like switches
-    extinfo-icon_image: symbols/switch.png
+    alias: Layer 2 Devices
+    extinfo-icon_image: base/switch40.png
     extinfo-icon_image_alt: switch
   layer3-infrastructure:
-    alias: layer 3 devices like routers
-    extinfo-icon_image: symbols/router.png
+    alias: Layer 3 Devices
+    extinfo-icon_image: base/switch40.png
     extinfo-icon_image_alt: router
   notacomputer:
     alias: Systems that are not really systems.  Yeah :)