From 5fc88a3872d0e138b611fd6d1341979232a1de90 Mon Sep 17 00:00:00 2001
From: krebs <krebs@UTART>
Date: Mon, 23 May 2011 16:22:29 +0200
Subject: updated shack infrastructure according to wiki

see: http://cert.eulerpfad.com/infrastruktur:topo

added access points including icons
added vdsl-modem,extern-switch
updated parents according to plan
updated coreswitch and serverswitch infrastructure
added check_sip script
a lot of more stuff probably
---
 modules/Monitoring/conf/krebs_hosts.cfg | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules/Monitoring/conf/krebs_hosts.cfg')

diff --git a/modules/Monitoring/conf/krebs_hosts.cfg b/modules/Monitoring/conf/krebs_hosts.cfg
index 6857cd45..4903020c 100644
--- a/modules/Monitoring/conf/krebs_hosts.cfg
+++ b/modules/Monitoring/conf/krebs_hosts.cfg
@@ -7,8 +7,8 @@ define host{
         host_name               krebs.shack
         alias                   krebs
         _tinc_address           10.7.7.156
-        address                 10.42.23.5 
-        parents                 shack-router
+        address                 10.42.23.5
+        parents                 shack-coreswitch
         hostgroups              krebs-machines,tinc-nodes,ssh-servers
         }
 #
@@ -20,7 +20,7 @@ define host{
         alias                   UTART
         _tinc_address           10.7.7.66
         address                 10.42.23.23
-        parents                 shack-router
+        parents                 shack-coreswitch
         hostgroups              krebs-machines,tinc-nodes,ssh-servers
         }
 #
@@ -31,7 +31,7 @@ define host{
         host_name               ytart
         alias                   ytart
         _tinc_address           10.7.7.201
-        parents                 shack-router
+        parents                 shack-coreswitch
         address                 10.42.1.227
         hostgroups              krebs-machines,tinc-nodes,ssh-servers
         }
@@ -44,7 +44,7 @@ define host{
         alias                   uPM Virtual Machine
         _tinc_address           10.7.7.99
         address                 upm.shack
-        parents                 shack-vplatform
+        parents                 shack-node1
         hostgroups              krebs-machines,ssh-servers,shack-rz 
         #,tinc-nodes
         }
@@ -61,7 +61,7 @@ define host{
         alias                   genericore Virtual Machine
         #_tinc_address           10.7.7.XX
         address                 genericore.shack
-        parents                 shack-vplatform
+        parents                 shack-node1
         hostgroups              ssh-servers,shack-rz
         #,tinc-nodes,krebs-machines
         }
-- 
cgit v1.2.3


From ddd37810eefa8c4fab4d15d67e815e7425d5b9f3 Mon Sep 17 00:00:00 2001
From: root <root@krebs>
Date: Wed, 25 May 2011 16:42:19 +0200
Subject: added Shepherd krebs

---
 modules/Monitoring/conf/krebs_hosts.cfg | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'modules/Monitoring/conf/krebs_hosts.cfg')

diff --git a/modules/Monitoring/conf/krebs_hosts.cfg b/modules/Monitoring/conf/krebs_hosts.cfg
index 4903020c..c258ed96 100644
--- a/modules/Monitoring/conf/krebs_hosts.cfg
+++ b/modules/Monitoring/conf/krebs_hosts.cfg
@@ -65,3 +65,13 @@ define host{
         hostgroups              ssh-servers,shack-rz
         #,tinc-nodes,krebs-machines
         }
+
+define host{
+        use                     generic-host
+        host_name               shepherd
+        alias                   Shepherd Krebs
+        _tinc_address           10.7.7.29
+        address                 shepherd.shack
+        parents                 shack-coreswitch
+        hostgroups              krebs-machines,tinc-nodes,ssh-servers
+        }
-- 
cgit v1.2.3