Merge branch 'master' of github.com:krebscode/painload

5 files changed, 204 insertions, 62 deletions

diff --git a/modules/Monitoring/conf/krebs_hosts.cfg b/modules/Monitoring/conf/krebs_hosts.cfg
index c52c6924..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
         }
 #
@@ -16,11 +16,11 @@ define host{
 #
 define host{
         use                     generic-host
-        host_name               utart.shack
+        host_name               utart
         alias                   UTART
         _tinc_address           10.7.7.66
-        address                 10.42.2.238
-        parents                 shack-router
+        address                 10.42.23.23
+        parents                 shack-coreswitch
         hostgroups              krebs-machines,tinc-nodes,ssh-servers
         }
 #
@@ -28,11 +28,11 @@ define host{
 #
 define host{
         use                     generic-host
-        host_name               ytart.shack
+        host_name               ytart
         alias                   ytart
         _tinc_address           10.7.7.201
-        parents                 shack-router
-        address                 10.42.2.254 #TODO check me
+        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
         }
diff --git a/modules/Monitoring/conf/shack_infrastructure.cfg b/modules/Monitoring/conf/shack_infrastructure.cfg
index 53bc688b..3adf193b 100644
--- a/modules/Monitoring/conf/shack_infrastructure.cfg
+++ b/modules/Monitoring/conf/shack_infrastructure.cfg
@@ -1,46 +1,160 @@
 #
 
-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
 #
+
+#
+# Virtualization and storage
+#
 define host{
         use                     generic-host
-        host_name               shack-vplatform
+        host_name               shack-node1
         alias                   Shack Virtualization Server
-        address                 node0.shack
-        parents                 shack-router
+        address                 10.42.0.10
+        parents                 shack-serverswitch
         hostgroups              shack-rz,ssh-servers
         }
 define host{
         use                     generic-host
-        host_name               shack-router
-        alias                   Shack Cisco Router
-        address                 10.42.0.3
+        host_name               shack-zetbox
+        alias                   Shack Virtualization Server
+        address                 10.42.0.10
+        parents                 shack-serverswitch
         hostgroups              shack-rz,ssh-servers
         }
-
 define host{
         use                     generic-host
         host_name               shack-plattenschwein
-        parents                 shack-router
+        parents                 shack-serverswitch
         alias                   Shack Plattenschwein
-        address                 plattenschwein.shack
+        address                 10.42.0.12
+        hostgroups              shack-rz,ssh-servers
+        }
+define host{
+        use                     generic-host
+        host_name               shack-gauda0
+        parents                 shack-serverswitch
+        alias                   Shack gauda0 Mining Server
+        address                 10.42.0.99
+        hostgroups              shack-rz
+        }
+#
+# Network Infrastructure
+#
+
+#
+## Shack gateway (no gateway-no internet)
+#
+define host{
+        use                     generic-host
+        host_name               shack-gw
+        parents                 shack-coreswitch
+        alias                   Watchguard Shack Gateway
+        address                 10.42.0.1
+        hostgroups              shack-rz,ssh-servers
+        }
+define host{
+        use                     generic-host
+        host_name               shack-modem
+        parents                 shack-gw
+        alias                   Shack Telecom VDSL Router
+        address                 192.168.2.1
+        hostgroups              shack-rz
+        }
+define host{
+        use                     generic-host
+        host_name               shack-externswitch
+        parents                 shack-gw
+        alias                   Shack External Switch (2.OG)
+        address                 10.0.10.2
+        hostgroups              shack-rz
+        }
+
+define service {
+        host_name               shack-gw
+        service_description     DNS Service
+        use                     generic-service
+        check_command           check_dns
+        }
+define host{
+        use                     generic-host
+        host_name               shack-coreswitch
+        alias                   Shack Cisco Router Coreswitch
+        address                 10.42.0.3
+        hostgroups              shack-rz,ssh-servers
+        }
+define host{
+        use                     generic-host
+        host_name               shack-serverswitch
+        parents                 shack-coreswitch
+        alias                   Shack Cisco Router Serverswitch
+        address                 10.42.0.4
         hostgroups              shack-rz,ssh-servers
         }
 
+define host{
+        use                     generic-host
+        host_name               shack-wlan-ap1
+        parents                 shack-coreswitch
+        alias                   Shack Wlan Access Point 1
+        address                 10.42.0.5
+        hostgroups              wlan-ap
+        }
+define host{
+        use                     generic-host
+        host_name               shack-wlan-ap2
+        parents                 shack-coreswitch
+        alias                   Shack Wlan Access Point 2
+        address                 10.42.0.6
+        hostgroups              wlan-ap
+        }
+define host{
+        use                     generic-host
+        host_name               shack-wlan-ap3
+        parents                 shack-coreswitch
+        alias                   Shack Wlan Access Point 3
+        address                 10.42.0.7
+        hostgroups              wlan-ap
+        }
+define host{
+        use                     generic-host
+        host_name               shack-wlan-ap4
+        parents                 shack-coreswitch
+        alias                   Shack Wlan Access Point 4
+        address                 10.42.0.8
+        hostgroups              wlan-ap
+        }
+define host{
+        use                     generic-host
+        host_name               shack-wlan-ap5
+        parents                 shack-coreswitch
+        alias                   Shack Wlan Access Point 5
+        address                 10.42.0.9
+        hostgroups              wlan-ap
+        }
+#
+# Voip Infrastructure
+#
+define host{
+        use                     generic-host
+        host_name               shack-voip
+        alias                   Shack Cisco VOIP Gateway
+        address                 10.42.0.2
+        parents                 shack-coreswitch
+        hostgroups              shack-rz,http-servers
+        }
+
+define service{
+        host_name               shack-voip
+        service_description     SIP Service
+        use                     generic-service
+        check_command           check_sip
+        }
+
+
+
+
 
 #
 # Shack DNS Server
@@ -49,7 +163,7 @@ define host{
 define host{
         use                     generic-host
         host_name               shack-dns
-        parents                 shack-vplatform
+        parents                 shack-zetbox
         alias                   Shack DNS Virtual Host
         address                 dns.shack
         hostgroups              shack-rz
@@ -58,21 +172,22 @@ define service {
         host_name               shack-dns
         service_description     DNS Service
         use                     generic-service
-        check_command           check_dns
+        check_command           check_dns_shack
         }
 
 define host{
         use                     generic-host
         host_name               shack-pxe
-        parents                 shack-vplatform
+        parents                 shack-zetbox
         alias                   Shack PXEBoot Vhost
         address                 pxeboot.shack
         hostgroups              shack-rz
         }
+
 define host{
         use                     generic-host
         host_name               shack-printsrv
-        parents                 shack-vplatform
+        parents                 shack-node1
         alias                   Shack Print Server
         address                 printer.shack
         hostgroups              shack-rz
@@ -81,7 +196,7 @@ define host{
 define host{
         use                     generic-host
         host_name               shack-aptproxy
-        parents                 shack-vplatform
+        parents                 shack-zetbox
         alias                   Shack Apt-proxy
         address                 aptproxy.shack
         hostgroups              shack-rz
@@ -90,7 +205,7 @@ define host{
 define host{
         use                     generic-host
         host_name               shack-shack
-        parents                 shack-vplatform
+        parents                 shack-node1
         alias                   Shack Data Exchange
         address                 shack.shack
         hostgroups              shack-rz,ssh-servers
@@ -102,7 +217,7 @@ define host{
 define host{
         use                     generic-host
         host_name               shack-ldap
-        parents                 shack-vplatform
+        parents                 shack-zetbox
         alias                   Shack LDAP Server
         address                 ldap.shack
         hostgroups              shack-rz
@@ -111,24 +226,6 @@ 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
+        check_command           check_ldap!shammunity
         }
 
diff --git a/modules/Monitoring/conf/shacknet.cfg b/modules/Monitoring/conf/shacknet.cfg
new file mode 100644
index 00000000..7658ab80
--- /dev/null
+++ b/modules/Monitoring/conf/shacknet.cfg
@@ -0,0 +1,34 @@
+define hostgroup {
+        hostgroup_name   shack-rz
+        alias            Shack RZ Infrastructure
+        }
+define hostgroup {
+        hostgroup_name   wlan-ap
+        alias            Shack Wlan Access Points
+        }
+define hostextinfo{
+        hostgroup_name   wlan-ap
+        notes            Access Points for Shack
+        icon_image       krebs/wireless_access_point.png
+        icon_image_alt   wireless_access_point
+        vrml_image       wireless_access_point.png
+        statusmap_image  krebs/wireless_access_point.gd2
+        }
+define hostextinfo{
+        hostgroup_name   shack-rz
+        notes            Shack RZ Infrastructure
+        icon_image       krebs/shack.png
+        icon_image_alt   shack-RZ
+        vrml_image       shack.png
+        statusmap_image  krebs/shack.gd2
+        }
+        
+define command {
+        command_name          check_sip
+        command_line          $USER1$/check_tcp -H $HOSTADDRESS$ -p 5060
+        }
+
+define command {
+	command_name	check_dns_shack
+	command_line	$USER1$/check_dns -H shack.shack -s '$HOSTADDRESS$'
+        }
diff --git a/modules/Monitoring/conf/tinc_hosts.cfg b/modules/Monitoring/conf/tinc_hosts.cfg
index ef2cb95d..23c2b75e 100644
--- a/modules/Monitoring/conf/tinc_hosts.cfg
+++ b/modules/Monitoring/conf/tinc_hosts.cfg
@@ -9,8 +9,15 @@ define host{
         alias                   Supernode External
         _TINC_ADDRESS           10.7.7.1
         address                 miefda.org
-        parents                 shack-gw
-        hostgroups              tinc-nodes,ssh-servers
+        parents                 shack-modem
+        hostgroups              tinc-nodes,ssh-servers,http-servers
+        }
+
+define service {
+        host_name                 supernode
+        service_description       IRC
+        use                       generic-service
+        check_command             check_ircd
         }
 #
 # Sharepoint (dhbw-stuttgart)
@@ -21,7 +28,7 @@ define host{
         alias                   PA Sharepoint
         address                 141.31.8.11
         _TINC_ADDRESS           10.7.7.5
-        parents                 shack-gw
+        parents                 shack-modem
         hostgroups              tinc-nodes,ssh-servers
         }
 #
@@ -33,6 +40,6 @@ define host{
         alias                   no_omo
         address                 leechi.kicks-ass.org
         _TINC_ADDRESS           10.7.7.111
-        parents                 shack-gw
+        parents                 shack-modem
         hostgroups              tinc-nodes,ssh-servers,http-servers
         }
diff --git a/modules/Monitoring/conf/tincnet.cfg b/modules/Monitoring/conf/tincnet.cfg
index d63119b3..f0b35b4e 100644
--- a/modules/Monitoring/conf/tincnet.cfg
+++ b/modules/Monitoring/conf/tincnet.cfg
@@ -16,6 +16,10 @@ define command {
         command_name check_internal_tinc_up
         command_line $USER1$/check_ping -H $_HOSTTINC_ADDRESS$ -w $ARG1$ -c $ARG2$
         }
+define command {
+        command_name check_ircd
+        command_line $USER1$/check_ircd $_HOSTTINC_ADDRESS$
+        }
 
 define service {
         hostgroup_name                  tinc-nodes