added whole shack-RZ, tinc nodes

krebs_hosts.cfg: added vhosts added parent relationships
shack_infrastructure.cfg: added whole RZ (was using nmap for enum)
tinc_hosts: added parents relationship
logos: added shack logo

5 files changed, 222 insertions, 3 deletions

diff --git a/modules/Monitoring/conf/krebs_hosts.cfg b/modules/Monitoring/conf/krebs_hosts.cfg
new file mode 100644
index 00000000..c52c6924
--- /dev/null
+++ b/modules/Monitoring/conf/krebs_hosts.cfg
@@ -0,0 +1,67 @@
+
+#
+# Ur-Krebs
+#
+define host{
+        use                     generic-host
+        host_name               krebs.shack
+        alias                   krebs
+        _tinc_address           10.7.7.156
+        address                 10.42.23.5 
+        parents                 shack-router
+        hostgroups              krebs-machines,tinc-nodes,ssh-servers
+        }
+#
+# UTART
+#
+define host{
+        use                     generic-host
+        host_name               utart.shack
+        alias                   UTART
+        _tinc_address           10.7.7.66
+        address                 10.42.2.238
+        parents                 shack-router
+        hostgroups              krebs-machines,tinc-nodes,ssh-servers
+        }
+#
+# ytart
+#
+define host{
+        use                     generic-host
+        host_name               ytart.shack
+        alias                   ytart
+        _tinc_address           10.7.7.201
+        parents                 shack-router
+        address                 10.42.2.254 #TODO check me
+        hostgroups              krebs-machines,tinc-nodes,ssh-servers
+        }
+#
+# uPM
+#
+define host{
+        use                     generic-host
+        host_name               upm
+        alias                   uPM Virtual Machine
+        _tinc_address           10.7.7.99
+        address                 upm.shack
+        parents                 shack-vplatform
+        hostgroups              krebs-machines,ssh-servers,shack-rz 
+        #,tinc-nodes
+        }
+
+# TODO add upm and genericore as tinc-nodes
+# TODO check MONGODB on uPM
+
+
+
+#TODO verkrebse genericore/get password
+define host{
+        use                     generic-host
+        host_name               genericore
+        alias                   genericore Virtual Machine
+        #_tinc_address           10.7.7.XX
+        address                 genericore.shack
+        parents                 shack-vplatform
+        hostgroups              ssh-servers,shack-rz
+        #,tinc-nodes,krebs-machines
+        }
diff --git a/modules/Monitoring/conf/shack_infrastructure.cfg b/modules/Monitoring/conf/shack_infrastructure.cfg
new file mode 100644
index 00000000..53bc688b
--- /dev/null
+++ b/modules/Monitoring/conf/shack_infrastructure.cfg
@@ -0,0 +1,134 @@
+#
+
+define hostgroup {
+        hostgroup_name   shack-rz
+        alias            Shack RZ Infrastructure
+        }
+define hostextinfo{
+        hostgroup_name   shack-rz
+        notes            Shack RZ Infrastructure
+#       notes_url        http://webserver.localhost.localdomain/hostinfo.pl?host=netware1
+        icon_image       krebs/shack.png
+        icon_image_alt   shack-RZ
+        vrml_image       shack.png
+        statusmap_image  krebs/shack.gd2
+        }
+#
+# Shack Virtual Machine Hoster Platform
+#
+define host{
+        use                     generic-host
+        host_name               shack-vplatform
+        alias                   Shack Virtualization Server
+        address                 node0.shack
+        parents                 shack-router
+        hostgroups              shack-rz,ssh-servers
+        }
+define host{
+        use                     generic-host
+        host_name               shack-router
+        alias                   Shack Cisco Router
+        address                 10.42.0.3
+        hostgroups              shack-rz,ssh-servers
+        }
+
+define host{
+        use                     generic-host
+        host_name               shack-plattenschwein
+        parents                 shack-router
+        alias                   Shack Plattenschwein
+        address                 plattenschwein.shack
+        hostgroups              shack-rz,ssh-servers
+        }
+
+
+#
+# Shack DNS Server
+#
+
+define host{
+        use                     generic-host
+        host_name               shack-dns
+        parents                 shack-vplatform
+        alias                   Shack DNS Virtual Host
+        address                 dns.shack
+        hostgroups              shack-rz
+        }
+define service {
+        host_name               shack-dns
+        service_description     DNS Service
+        use                     generic-service
+        check_command           check_dns
+        }
+
+define host{
+        use                     generic-host
+        host_name               shack-pxe
+        parents                 shack-vplatform
+        alias                   Shack PXEBoot Vhost
+        address                 pxeboot.shack
+        hostgroups              shack-rz
+        }
+define host{
+        use                     generic-host
+        host_name               shack-printsrv
+        parents                 shack-vplatform
+        alias                   Shack Print Server
+        address                 printer.shack
+        hostgroups              shack-rz
+        }
+
+define host{
+        use                     generic-host
+        host_name               shack-aptproxy
+        parents                 shack-vplatform
+        alias                   Shack Apt-proxy
+        address                 aptproxy.shack
+        hostgroups              shack-rz
+        }
+
+define host{
+        use                     generic-host
+        host_name               shack-shack
+        parents                 shack-vplatform
+        alias                   Shack Data Exchange
+        address                 shack.shack
+        hostgroups              shack-rz,ssh-servers
+        }
+
+#
+# shack ldap server
+#
+define host{
+        use                     generic-host
+        host_name               shack-ldap
+        parents                 shack-vplatform
+        alias                   Shack LDAP Server
+        address                 ldap.shack
+        hostgroups              shack-rz
+        }
+define service {
+        host_name               shack-ldap
+        service_description     LDAP Service
+        use                     generic-service
+        check_command           check_ldap!shack
+        }
+
+#
+# Shack gateway
+#
+define host{
+        use                     generic-host
+        host_name               shack-gw
+        parents                 shack-router
+        alias                   Watchguard Shack Gateway
+        address                 10.42.0.1
+        hostgroups              shack-rz,ssh-servers
+        }
+define service {
+        host_name               shack-gw
+        service_description     DNS Service
+        use                     generic-service
+        check_command           check_dns
+        }
+
diff --git a/modules/Monitoring/conf/tinc_hosts.cfg b/modules/Monitoring/conf/tinc_hosts.cfg
index 03cfcc41..ef2cb95d 100644
--- a/modules/Monitoring/conf/tinc_hosts.cfg
+++ b/modules/Monitoring/conf/tinc_hosts.cfg
@@ -1,20 +1,38 @@
+#connection will not work if no internet is available (e.g. no shack-gateway)
 
 #
 # Miefda Supernode
 #
 define host{
         use                     generic-host
-        host_name               miefda.org
+        host_name               supernode
         alias                   Supernode External
         _TINC_ADDRESS           10.7.7.1
+        address                 miefda.org
+        parents                 shack-gw
         hostgroups              tinc-nodes,ssh-servers
         }
-
+#
+# Sharepoint (dhbw-stuttgart)
+#
 define host{
         use                     generic-host
-        host_name               pa-sharepoint.informatik.ba-stuttgart.de
+        host_name               sharepoint
         alias                   PA Sharepoint
         address                 141.31.8.11
         _TINC_ADDRESS           10.7.7.5
+        parents                 shack-gw
         hostgroups              tinc-nodes,ssh-servers
         }
+#
+# Leechi
+#
+define host{
+        use                     generic-host
+        host_name               leechi
+        alias                   no_omo
+        address                 leechi.kicks-ass.org
+        _TINC_ADDRESS           10.7.7.111
+        parents                 shack-gw
+        hostgroups              tinc-nodes,ssh-servers,http-servers
+        }
diff --git a/modules/Monitoring/htdocs/images/logos/krebs/shack.gd2 b/modules/Monitoring/htdocs/images/logos/krebs/shack.gd2
new file mode 100644
index 00000000..8b0d98e5
--- /dev/null
+++ b/modules/Monitoring/htdocs/images/logos/krebs/shack.gd2
diff --git a/modules/Monitoring/htdocs/images/logos/krebs/shack.png b/modules/Monitoring/htdocs/images/logos/krebs/shack.png
new file mode 100644
index 00000000..53f1275b
--- /dev/null
+++ b/modules/Monitoring/htdocs/images/logos/krebs/shack.png