From 5fc88a3872d0e138b611fd6d1341979232a1de90 Mon Sep 17 00:00:00 2001 From: krebs 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 +- modules/Monitoring/conf/shack_infrastructure.cfg | 193 +++++++++++++++++------ modules/Monitoring/conf/shacknet.cfg | 34 ++++ modules/Monitoring/conf/tinc_hosts.cfg | 6 +- 4 files changed, 186 insertions(+), 59 deletions(-) create mode 100644 modules/Monitoring/conf/shacknet.cfg (limited to 'modules/Monitoring/conf') 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 } diff --git a/modules/Monitoring/conf/shack_infrastructure.cfg b/modules/Monitoring/conf/shack_infrastructure.cfg index 2b75a241..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 @@ -60,23 +174,20 @@ define service { use generic-service check_command check_dns_shack } -define command { - command_name check_dns_shack - command_line /usr/lib/nagios/plugins/check_dns -H shack.shack -s '$HOSTADDRESS$' - } 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 @@ -85,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 @@ -94,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 @@ -106,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 @@ -118,21 +229,3 @@ define service { check_command check_ldap!shammunity } -# -# 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/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 4b1ad9ab..23c2b75e 100644 --- a/modules/Monitoring/conf/tinc_hosts.cfg +++ b/modules/Monitoring/conf/tinc_hosts.cfg @@ -9,7 +9,7 @@ define host{ alias Supernode External _TINC_ADDRESS 10.7.7.1 address miefda.org - parents shack-gw + parents shack-modem hostgroups tinc-nodes,ssh-servers,http-servers } @@ -28,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 } # @@ -40,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 } -- cgit v1.2.3 From 9057f9391669d1add93651600c4bfd6b76d1e613 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 24 May 2011 22:37:07 +0200 Subject: added shack-dns as ip-address this helps identifying local dns failure --- modules/Monitoring/conf/shack_infrastructure.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/Monitoring/conf') diff --git a/modules/Monitoring/conf/shack_infrastructure.cfg b/modules/Monitoring/conf/shack_infrastructure.cfg index 3adf193b..9a9dfd09 100644 --- a/modules/Monitoring/conf/shack_infrastructure.cfg +++ b/modules/Monitoring/conf/shack_infrastructure.cfg @@ -165,7 +165,7 @@ define host{ host_name shack-dns parents shack-zetbox alias Shack DNS Virtual Host - address dns.shack + address 10.42.0.100 hostgroups shack-rz } define service { -- cgit v1.2.3 From c99000c0edf6bfc2ee6545f9e2ad04c99cd8a96e Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 May 2011 16:36:14 +0200 Subject: added google hosts, updated serverswitch --- modules/Monitoring/conf/other_hosts.cfg | 23 +++++++++++++++++++++++ modules/Monitoring/conf/shack_infrastructure.cfg | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 modules/Monitoring/conf/other_hosts.cfg (limited to 'modules/Monitoring/conf') diff --git a/modules/Monitoring/conf/other_hosts.cfg b/modules/Monitoring/conf/other_hosts.cfg new file mode 100644 index 00000000..bfc36154 --- /dev/null +++ b/modules/Monitoring/conf/other_hosts.cfg @@ -0,0 +1,23 @@ +define host{ + use generic-host + host_name google.de + alias Google Website + address google.de + parents shack-modem + hostgroups http-servers + } + +define host{ + use generic-host + host_name google-dns + parents shack-gw + parents shack-modem + alias Google DNS Service (always reachable) + address 8.8.8.8 + } +define service { + host_name google-dns + service_description DNS Service + use generic-service + check_command check_dns + } diff --git a/modules/Monitoring/conf/shack_infrastructure.cfg b/modules/Monitoring/conf/shack_infrastructure.cfg index 9a9dfd09..dd123dc3 100644 --- a/modules/Monitoring/conf/shack_infrastructure.cfg +++ b/modules/Monitoring/conf/shack_infrastructure.cfg @@ -36,7 +36,7 @@ define host{ host_name shack-gauda0 parents shack-serverswitch alias Shack gauda0 Mining Server - address 10.42.0.99 + address gauda0.shack hostgroups shack-rz } # @@ -90,7 +90,7 @@ define host{ parents shack-coreswitch alias Shack Cisco Router Serverswitch address 10.42.0.4 - hostgroups shack-rz,ssh-servers + hostgroups shack-rz } define host{ -- cgit v1.2.3 From ddd37810eefa8c4fab4d15d67e815e7425d5b9f3 Mon Sep 17 00:00:00 2001 From: root 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') 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