tessera - graphing dashboard

* nginx vhost * uwsgi app server * dashboards
snmp - adding snmptrapd and snmptt configurations
2015-11-10 16:08:40 +02:00 · 2015-11-10 16:00:07 +02:00 · 2015-11-10 15:49:52 +02:00 · 2015-11-10 15:49:22 +02:00 · 2015-11-10 15:45:35 +02:00 · 2015-11-10 15:14:52 +02:00
48 changed files with 2594 additions and 1 deletions
--- a/communication/slack/config/openfest-slack-to-irc-sync.json
+++ b/communication/slack/config/openfest-slack-to-irc-sync.json
@ -2,11 +2,13 @@
 	"nickname": "SlackSync",
 	"server": "marla.ludost.net",
 	"token": "CHANGE ME",
+	"logfile": "/path/to/logfile.log",
 	"channelMapping": {
 		"private": "private",
 		"#bulgaria-hall": "#openfest-bulgaria-hall",
 		"#chamber-hall": "#openfest-chamber-hall",
-		"#third-hall": "#openfest-third-hall"
+		"#third-hall": "#openfest-third-hall",
+		"#video": "#openfestvideo"
 	},
 	"ircOptions": {
 		"userName": "slacksync",
--- a/monitoring/arpwatch/README.md
+++ b/monitoring/arpwatch/README.md
@ -0,0 +1,15 @@
+# ArpWatch
+Monitor stations on network
+
+# Prerequisites
+vlans
+arpwatch
+
+# Notes
+* Ignore main interface on which vlans are set
+
+# Configuration
+* Add alias to drop the emails that are being sent
+* add filter to syslog (rsyslog) to direct messages to special file
+* fix arpwatch.conf to start daemon per interface (look at notes above)
+* go
--- a/monitoring/arpwatch/aliases
+++ b/monitoring/arpwatch/aliases
@ -0,0 +1 @@
+nukemailz: /dev/null
--- a/monitoring/arpwatch/arpwatch.conf
+++ b/monitoring/arpwatch/arpwatch.conf
@ -0,0 +1,8 @@
+# prod setup
+eth0 -m nukemailz
+#eth1 -m nukemailz
+eth1.100 -m nukemailz
+eth1.101 -m nukemailz
+eth1.102 -m nukemailz
+eth1.103 -m nukemailz
+eth1.104 -m nukemailz
--- a/monitoring/arpwatch/rsyslogd-arpwatch.conf
+++ b/monitoring/arpwatch/rsyslogd-arpwatch.conf
@ -0,0 +1,2 @@
+# log arpwatch in a separate file
+if $programname == 'arpwatch' then /var/log/arpwatch.log
--- a/monitoring/collectd/scripts/unbound-collectd/README.md
+++ b/monitoring/collectd/scripts/unbound-collectd/README.md
@ -0,0 +1,7 @@
+# unbound-collectd.sh
+Simple script to monitor unbound
+
+# Prerequisites
+ * Unbound
+ * `/etc/unbound/*.key` and `/etc/unbound/*.pem` should have group unbound
+ * exec section should execute the script with user unbound
--- a/monitoring/collectd/scripts/unbound-collectd/unbound-collectd.sh
+++ b/monitoring/collectd/scripts/unbound-collectd/unbound-collectd.sh
@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# simple script to monitor unbound
+# All metrics are gauges
+
+HOSTNAME="${COLLECTD_HOSTNAME:-eric}"
+INTERVAL="${COLLECTD_INTERVAL:-10}"
+
+while sleep "$INTERVAL"; do
+        /usr/sbin/unbound-control stats | while read line;do
+                INSTANCE=`echo $line | cut -d= -f1 | cut -d. -f1`
+                STAT=`echo $line | cut -d= -f1 | cut -d. -f2- \
+                        | sed 's/\./-/g' | sed 's/recursion-time-/recursion-time_/g' \
+                        | sed 's/now/time-now/g' | sed 's/up/time-up/g' \
+                        | sed 's/elapsed/time-elapsed/g' `
+                VALUE=`echo $line | cut -d= -f2`
+
+                echo "PUTVAL \"$HOSTNAME/unbound-${INSTANCE}/$STAT\" interval=$INTERVAL N:$VALUE"
+        done
+done
--- a/monitoring/collectd/server/collectd.conf
+++ b/monitoring/collectd/server/collectd.conf
@ -137,6 +137,106 @@ LoadPlugin ConnTrack
 # context switches (how hard we are working)
 LoadPlugin ContextSwitch

+# Switches perf mon via snmp
+LoadPlugin snmp
+<Plugin snmp>
+	# data points
+	# collect traffic (all interfaces)
+	<Data "std_traffic">
+		Type "if_octets"
+		Table true
+		Instance "IF-MIB::ifName"
+		Values "IF-MIB::ifHCInOctets" "IF-MIB::ifHCOutOctets"
+	</Data>
+
+	# collect errors
+	<Data "std_errors">
+		Type "if_errors"
+		Table true
+		Instance "IF-MIB::ifName"
+		Values "IF-MIB::ifInErrors" "IF-MIB::ifOutErrors"
+	</Data>
+
+	# now gather my minnion
+	<Host "coresw">
+		Address "10.100.0.11"
+		Version 2
+		Community "0penfest"
+		Collect "std_traffic" "std_errors"
+		Interval 60
+	</Host>
+
+	<Host "nocsw">
+		Address "10.100.0.12"
+		Version 2
+		Community "0penfest"
+		Collect "std_traffic" "std_errors"
+		Interval 60
+	</Host>
+
+	<Host "teamsw">
+		Address "10.100.0.13"
+		Version 2
+		Community "0penfest"
+		Collect "std_traffic" "std_errors"
+		Interval 60
+	</Host>
+
+	<Host "wssw">
+		Address "10.100.0.14"
+		Version 2
+		Community "0penfest"
+		Collect "std_traffic" "std_errors"
+		Interval 60
+	</Host>
+
+	<Host "receptionsw">
+		Address "10.100.0.15"
+		Version 2
+		Community "0penfest"
+		Collect "std_traffic" "std_errors"
+		Interval 60
+	</Host>
+
+	<Host "camsw">
+		Address "10.100.0.16"
+		Version 2
+		Community "0penfest"
+		Collect "std_traffic" "std_errors"
+		Interval 60
+	</Host>
+
+	<Host "f2sw">
+		Address "10.100.0.17"
+		Version 2
+		Community "0penfest"
+		Collect "std_traffic" "std_errors"
+		Interval 60
+	</Host>
+
+	<Host "mussw">
+		Address "10.100.0.18"
+		Version 2
+		Community "0penfest"
+		Collect "std_traffic" "std_errors"
+		Interval 60
+	</Host>
+</Plugin>
+
+# monitor unbound by exec
+LoadPlugin exec
+<Plugin exec>
+	Exec "unbound" "/usr/local/bin/unbound-collectd.sh"
+</Plugin>
+
+# See collectd.conf(5)
+LoadPlugin unixsock
+<Plugin unixsock>
+	SocketFile "/tmp/collectd.sock"
+	SocketGroup "nagios"
+	SocketPerms "0770"
+</Plugin>
+
 # and finaly save the data in graphite
 LoadPlugin write_graphite
 <Plugin write_graphite>
--- a/monitoring/graphite/graphite-conf/rewrite-rules.conf
+++ b/monitoring/graphite/graphite-conf/rewrite-rules.conf
@ -24,3 +24,16 @@
 # Rewrite temperature sensors to be less ugly
 # temperature-Temp_1_system_internal_expansion_board_16_5_/value.wsp
 temperature-Temp_([0-9]+)_([a-zA-Z0-9_]+)__(.*)\. = Temp-\1_\2.
+
+# nest under common root
+if_errors-(.*).(rx|tx)$ = \1.errors.\2
+if_octets-(.*).(rx|tx)$ = \1.octets.\2
+
+# expand cisco naming
+Vl([0-9]+) = Vlan\1
+
+# rename tplink ports
+port_([0-9]+):_Gigabit_(Fiber|Copper) = Gi\1
+
+# rename tplink vlans
+Vlan-interface([0-9]+) = Vlan\1
--- a/monitoring/graphite/graphite-conf/storage-schemas.conf
+++ b/monitoring/graphite/graphite-conf/storage-schemas.conf
@ -11,6 +11,11 @@
 pattern = ^carbon\.
 retentions = 10:30d

+# SNMP monitoring shit
+[switches_snmp]
+pattern = sw\.snmp\.
+retentions = 60s:30d
+
 # final defaults
 [default_10s_6months]
 pattern = .*
--- a/monitoring/nagios3/README.md
+++ b/monitoring/nagios3/README.md
@ -0,0 +1,2 @@
+# nagios3 configs
+Some of the nagios3 configs
--- a/monitoring/nagios3/configs/custom-commands.cfg
+++ b/monitoring/nagios3/configs/custom-commands.cfg
@ -0,0 +1,23 @@
+# check the snmp from the switches
+define command {
+	command_name check_snmp_cisco
+	command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C 0penfest -P 2c -o $ARG1$ $ARG2$ $ARG3$
+}
+
+# minimalistic stream counter
+define command {
+	command_name check_stream_count
+	command_line /usr/local/bin/count-streams.sh $ARG1$ $ARG2$
+}
+
+# rtmp checker / Arcopix
+define command {
+	command_name check_rtmp
+	command_line /usr/lib/nagios/plugins/check_rtmp.sh -u $ARG1$ -t 5
+}
+
+# check collectd for issues
+define command {
+	command_name check_collectd
+	command_line /usr/bin/collectd-nagios -s /tmp/collectd.sock -H $HOSTALIAS$ -n $ARG1$ -w $ARG2$ -c $ARG3$
+}
--- a/monitoring/nagios3/configs/custom-services.cfg
+++ b/monitoring/nagios3/configs/custom-services.cfg
@ -0,0 +1,181 @@
+; Check uptime
+define service {
+	use			generic-service
+	service_description	Switch uptime
+	check_interval		5
+	check_command		check_snmp_cisco!1.3.6.1.2.1.1.3.0
+	hostgroup	cisco-switches,tplink-switches
+}
+
+; define SNMP TRAP BASE service
+define service {
+	name SNMP_TRAP
+	service_description SNMP_TRAP
+	active_checks_enabled           1       ; Active service checks are enabled
+	passive_checks_enabled          1       ; Passive service checks are enabled/accepted
+	parallelize_check               1       ; Active service checks should be parallelized
+	process_perf_data               0
+	obsess_over_service             0       ; We should obsess over this service (if necessary)
+	check_freshness                 0       ; Default is to NOT check service 'freshness'
+	notifications_enabled           1       ; Service notifications are enabled
+	event_handler_enabled           1       ; Service event handler is enabled
+	flap_detection_enabled          1       ; Flap detection is enabled
+	process_perf_data               1       ; Process performance data
+	retain_status_information       1       ; Retain status information across program restarts
+	retain_nonstatus_information    1       ; Retain non-status information across program restarts
+	check_command                   check-host-alive      ; This will be used to reset the service to "OK"
+	is_volatile                     1
+	check_period                    24x7
+	max_check_attempts              1
+	normal_check_interval           1
+	retry_check_interval            1
+	notification_interval           120
+	notification_period             24x7
+	notification_options            w,u,c,r
+	contact_groups                  ofnoc       ; Modify this to match your Nagios contact group definitions
+	register
+}
+
+; TRAP itself
+define service {
+	use SNMP_TRAP
+	hostgroup_name cisco-switches,tplink-switches
+	service_description TRAP
+	check_interval 120
+	flap_detection_enabled	0
+}
+
+; Cisco Switches CPU Avg (5 min)
+define service {
+	use                     generic-service
+	hostgroup               cisco-switches
+	service_description     5 Min CPU Average
+	check_interval          5
+	check_command           check_snmp_cisco!.1.3.6.1.4.1.9.9.109.1.1.1.1.8.1!-l \"5 Minute CPU \% \" -w 50 -c 80
+}
+
+; 1 min
+define service {
+	use                     generic-service
+	hostgroup               cisco-switches
+	service_description     1 Min CPU Average
+	check_interval          1
+	check_command           check_snmp_cisco!.1.3.6.1.4.1.9.9.109.1.1.1.1.7.1!-l \"1 Minute CPU \% \" -w 50 -c 80
+}
+
+; Stream counter
+define service {
+	use	generic-service
+	host_name	eric
+	service_description	Stream Count
+	check_command	check_stream_count!5!3
+}
+
+; check individual streams
+; Bulgaria-HD
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	Bulgaria HD stream / ERIC
+	check_command		check_rtmp!rtmp://127.0.0.1/st/bulgaria-hd
+	max_check_attempts	1
+}
+
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	Bulgaria HD stream / MARLA
+	check_command		check_rtmp!rtmp://79.98.105.21/st/bulgaria-hd
+	max_check_attempts	1
+}
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	Bulgaria HD stream / HAWK
+	check_command		check_rtmp!rtmp://79.124.31.206/st/bulgaria-hd
+}
+
+; Bulgaria-normal
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	Bulgaria stream / ERIC
+	check_command		check_rtmp!rtmp://127.0.0.1/st/bulgaria
+	max_check_attempts	1
+}
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	Bulgaria stream / MARLA
+	check_command		check_rtmp!rtmp://79.98.105.21/st/bulgaria
+	max_check_attempts	1
+}
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	Bulgaria stream / HAWK
+	check_command		check_rtmp!rtmp://79.124.31.206/st/bulgaria
+	max_check_attempts	1
+}
+
+; Chamber
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	CHAMBER stream / ERIC
+	check_command		check_rtmp!rtmp://127.0.0.1/st/chamber
+	max_check_attempts	1
+}
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	CHAMBER stream / MARLA
+	check_command		check_rtmp!rtmp://79.98.105.21/st/chamber
+	max_check_attempts	1
+}
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	CHAMBER stream / HAWK
+	check_command		check_rtmp!rtmp://79.124.31.206/st/chamber
+	max_check_attempts	1
+}
+
+; zala muzika (third)
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	MUSIC stream / ERIC
+	check_command		check_rtmp!rtmp://127.0.0.1/st/music
+	max_check_attempts	1
+}
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	MUSIC stream / MARLA
+	check_command		check_rtmp!rtmp://79.98.105.21/st/music
+	max_check_attempts	1
+}
+define service {
+	use			generic-service
+	host_name		eric
+	service_description	MUSIC stream / HAWK
+	check_command		check_rtmp!rtmp://79.124.31.206/st/music
+	max_check_attempts	1
+}
+
+; check ap load via collectd
+define service{
+	use			generic-service
+	service_description	Load
+	check_command		check_collectd!load/load!0.5!0.7
+	hostgroup		ap-group
+}
+
+; check telnet available on switches
+define service{
+	use			generic-service
+	service_description	Telnet
+	check_command		check_telnet_4!
+	hostgroup		core-switches
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-bulgaria-1-ac.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-bulgaria-1-ac.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-bulgaria-1-ac
+	use		generic-host
+	alias		ap-bulgaria-1-ac
+	address		10.100.0.200
+	hostgroups	ap-group
+	parents		nocsw
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-bulgaria-2-ac.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-bulgaria-2-ac.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-bulgaria-2-ac
+	use		generic-host
+	alias		ap-bulgaria-2-ac
+	address		10.100.0.201
+	hostgroups	ap-group
+	parents		nocsw
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-bulgaria-3-ac.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-bulgaria-3-ac.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-bulgaria-3-ac
+	use		generic-host
+	alias		ap-bulgaria-3-ac
+	address		10.100.0.202
+	hostgroups	ap-group
+	parents		nocsw
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-bulgaria-4-legacy.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-bulgaria-4-legacy.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-bulgaria-4-legacy
+	use		generic-host
+	alias		ap-bulgaria-4-legacy
+	address		10.100.0.203
+	hostgroups	ap-group
+	parents		nocsw
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-chamber-1-ac.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-chamber-1-ac.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-chamber-1-ac
+	use		generic-host
+	alias		ap-chamber-1-ac
+	address		10.100.0.204
+	hostgroups	ap-group
+	parents		camsw
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-chamber-2-ac.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-chamber-2-ac.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-chamber-2-ac
+	use		generic-host
+	alias		ap-chamber-2-ac
+	address		10.100.0.205
+	hostgroups	ap-group
+	parents		camsw
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-lobby1-1-an.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-lobby1-1-an.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-lobby1-1-an
+	use		generic-host
+	alias		ap-lobby1-1-an
+	address		10.100.0.208
+	hostgroups	ap-group
+	parents		wssw
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-lobby1-3-an.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-lobby1-3-an.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-lobby1-3-an
+	use		generic-host
+	alias		ap-lobby1-3-an
+	address		10.100.0.210
+	hostgroups	ap-group
+	parents		receptionsw
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-lobby2-1-an.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-lobby2-1-an.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-lobby2-1-an
+	use		generic-host
+	alias		ap-lobby2-1-an
+	address		10.100.0.211
+	hostgroups	ap-group
+	parents		f2sw
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-marble-1-ac.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-marble-1-ac.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-marble-1-ac
+	use		generic-host
+	alias		ap-marble-1-ac
+	address		10.100.0.207
+	hostgroups	ap-group
+	parents		wssw
+}
--- a/monitoring/nagios3/configs/objects/ap/ap-music-1-ac.cfg
+++ b/monitoring/nagios3/configs/objects/ap/ap-music-1-ac.cfg
@ -0,0 +1,8 @@
+define host {
+	host_name	ap-music-1-ac
+	use		generic-host
+	alias		ap-music-1-ac
+	address		10.100.0.206
+	hostgroups	ap-group
+	parents		mussw
+}
--- a/monitoring/nagios3/configs/objects/switch/01-core-coresw.cfg
+++ b/monitoring/nagios3/configs/objects/switch/01-core-coresw.cfg
@ -0,0 +1,212 @@
+define host {
+	host_name coresw
+	use generic-host
+	alias CoreSW
+	address 10.100.0.11
+	hostgroups cisco-switches
+	parents		eric
+}
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Vlan100 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.100!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/01 - nocsw 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10101!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw
+ 	 service_description 	 Gi1/0/02 - teamsw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10102!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/03 - wssw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10103!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/04 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10104!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/05 - eagle
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10105!-r 2!-l ifOperStatus
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/06 - eric/video
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10106!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/07 - eric/main
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10107!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/08 - external netx
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10108!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/09 - encoder 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10109!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/10 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10110!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/11 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10111!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/12 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10112!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/13 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10113!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/14 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10114!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/15 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10115!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/16 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10116!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/17 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10117!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/18 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10118!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/19 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10119!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/20 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10120!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/21 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10121!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/22 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10122!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/23 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10123!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/24 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10124!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/25 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10125!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/26 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10126!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/27 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10127!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 coresw 
+ 	 service_description 	 Gi1/0/28 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10128!-r 2!-l ifOperStatus 
+ 	 } 
+
--- a/monitoring/nagios3/configs/objects/switch/02-core-nocsw.cfg
+++ b/monitoring/nagios3/configs/objects/switch/02-core-nocsw.cfg
@ -0,0 +1,374 @@
+define host {
+	host_name nocsw
+	use generic-host
+	alias NOCSW
+	address 10.100.0.12
+	hostgroups cisco-switches
+	parents		eric
+}
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 FastEthernet1 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.1!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 Gi1/01 - coresw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.2!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 Gi1/02 - f2sw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.3!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 Gi1/03 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.4!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 Gi1/04 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.5!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 Gi1/05 - AP1
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.6!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 Gi1/06 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.7!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 Gi1/07 - video/bulgaria/usersw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.8!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 Gi1/08 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
+ 	 } 
+
+; This is the noc, we don't care what happens above port 8
+; By Stefan Lekov
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/09 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/10 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.11!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/11 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.12!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/12 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.13!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/13 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.14!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/14 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.15!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/15 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.16!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/16 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.17!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/17 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.18!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/18 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.19!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/19 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.20!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/20 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.21!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/21 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.22!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/22 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.23!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/23 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.24!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/24 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.25!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/25 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.26!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/26 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.27!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/27 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.28!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/28 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.29!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/29 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.30!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/30 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.31!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/31 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.32!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/32 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.33!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/33 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.34!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/34 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.35!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/35 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.36!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/36 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.37!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/37 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.38!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/38 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.39!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/39 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.40!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/40 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.41!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/41 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.42!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/42 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.43!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/43 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.44!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/44 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.45!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/45 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.46!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/46 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.47!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/47 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.48!-r 2!-l ifOperStatus 
+; 	 } 
+;
+;define service { 
+; 	 use 	 	 	 generic-service 
+; 	 hosts 	 	 	 nocsw 
+; 	 service_description 	 Gi1/48 
+; 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.49!-r 2!-l ifOperStatus 
+; 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 TenGi1/49 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.50!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 TenGi1/50 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.51!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 nocsw 
+ 	 service_description 	 Vlan100 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.65!-r 1!-l ifOperStatus 
+ 	 } 
+
--- a/monitoring/nagios3/configs/objects/switch/03-core-teamsw.cfg
+++ b/monitoring/nagios3/configs/objects/switch/03-core-teamsw.cfg
@ -0,0 +1,213 @@
+define host {
+	host_name teamsw
+	use generic-host
+	alias TeamSW
+	address 10.100.0.13
+        hostgroups cisco-switches
+	parents		eric
+}
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Vlan100 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.100!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/01 - coresw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10601!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/02 - f2sw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10602!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/03 - receptionsw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10603!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/04 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10604!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/05 - AP3
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10605!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/06 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10606!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/07 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10607!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/08 - bulgaria/usersw / not in use
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10608!-r 2!-l ifOperStatus 
+	notifications_enabled 0
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/09 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10609!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/10 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10610!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/11 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10611!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/12 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10612!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/13 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10613!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/14 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10614!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/15 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10615!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/16 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10616!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/17 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10617!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/18 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10618!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/19 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10619!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/20 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10620!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/21 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10621!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/22 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10622!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/23 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10623!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/24 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10624!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/25 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10625!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/26 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10626!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/27 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10627!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 teamsw 
+ 	 service_description 	 Gi2/0/28 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10628!-r 2!-l ifOperStatus 
+ 	 } 
+
--- a/monitoring/nagios3/configs/objects/switch/04-core-wssw.cfg
+++ b/monitoring/nagios3/configs/objects/switch/04-core-wssw.cfg
@ -0,0 +1,99 @@
+define host {
+	host_name wssw
+	use generic-host
+	alias WSSW
+	address 10.100.0.14
+        hostgroups cisco-switches
+	parents		eric
+}
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/01 - coresw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.1!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/02 - DEAD
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.2!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/03 - mussw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.3!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/04 - camsw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.4!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/05 - AP5
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.5!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/06 - AP8
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.6!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/07 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.7!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/08 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.8!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/09 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/10 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/11 - usersw/ws
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.11!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Gi0/12 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.12!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 wssw 
+ 	 service_description 	 Vlan100 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.15!-r 1!-l ifOperStatus 
+ 	 } 
+
--- a/monitoring/nagios3/configs/objects/switch/05-core-receptionsw.cfg
+++ b/monitoring/nagios3/configs/objects/switch/05-core-receptionsw.cfg
@ -0,0 +1,85 @@
+define host {
+	host_name receptionsw
+	use generic-host
+	alias ReceptionSW
+	address 10.100.0.15
+	hostgroups tplink-switches
+	parents		eric
+}
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Gi1/0/01 - teamsw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.1!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Gi1/0/02 - camsw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.2!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Gi1/0/03 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.3!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Gi1/0/04 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.4!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Gi1/0/05 - AP06
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.5!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Gi1/0/06 - AP07/disabled
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.6!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Gi1/0/7 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.7!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Gi1/0/8 - kiosk ecard
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.8!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Gi1/0/9 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Gi1/0/10 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 receptionsw 
+ 	 service_description 	 Vlan100
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.52802!-r 1!-l ifOperStatus 
+ 	 } 
+
--- a/monitoring/nagios3/configs/objects/switch/06-core-camsw.cfg
+++ b/monitoring/nagios3/configs/objects/switch/06-core-camsw.cfg
@ -0,0 +1,88 @@
+define host {
+	host_name camsw
+	use generic-host
+	alias CamSW
+	address 10.100.0.16
+	hostgroups tplink-switches
+	parents		eric
+}
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Gi1/0/01 - receptionsw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.1!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Gi1/0/02 - wssw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.2!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Gi1/0/03 - ALTONA
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.3!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Gi1/0/04 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.4!-r 2!-l ifOperStatus
+	 register		0
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Gi1/0/05 - AP10
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.5!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Gi1/0/06 - AP09
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.6!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Gi1/0/07 - video/chamber/usersw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.7!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Gi1/0/08 - presenter/chamber
+	 check_command		 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.8!-r " (1|2)$"!-l ifOperStatus
+	 notifications_enabled 0
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Gi1/0/09 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Gi1/0/10 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 camsw 
+ 	 service_description 	 Vlan100
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.52802!-r 1!-l ifOperStatus 
+ 	 } 
+
--- a/monitoring/nagios3/configs/objects/switch/07-core-f2sw.cfg
+++ b/monitoring/nagios3/configs/objects/switch/07-core-f2sw.cfg
@ -0,0 +1,212 @@
+define host {
+	host_name f2sw
+	use generic-host
+	alias F2SW
+	address 10.100.0.17
+        hostgroups cisco-switches
+	parents		eric
+}
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Vlan100 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.100!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/01 - nocsw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10101!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/02 - mussw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10102!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/03 - teamsw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10103!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/04 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10104!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/05 - AP12
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10105!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/06 - AP13
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10106!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/07 - usersw/disabled
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10107!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/08 - what
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10108!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/09 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10109!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/10 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10110!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/11 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10111!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/12 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10112!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/13 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10113!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/14 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10114!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/15 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10115!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/16 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10116!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/17 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10117!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/18 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10118!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/19 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10119!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/20 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10120!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/21 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10121!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/22 - overflow
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10122!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/23 - overflow
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10123!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/24 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10124!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/25 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10125!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/26 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10126!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/27 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10127!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 f2sw 
+ 	 service_description 	 Gi1/0/28 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10128!-r 2!-l ifOperStatus 
+ 	 } 
+
--- a/monitoring/nagios3/configs/objects/switch/08-core-mussw.cfg
+++ b/monitoring/nagios3/configs/objects/switch/08-core-mussw.cfg
@ -0,0 +1,86 @@
+define host {
+	host_name mussw
+	use generic-host
+	alias MusSW
+	address 10.100.0.18
+	hostgroups tplink-switches
+	parents		eric
+}
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Gi1/0/01 - wssw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.1!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Gi1/0/02 - f2sw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.2!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Gi1/0/03 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.3!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Gi1/0/04 - ALTONA
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.4!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Gi1/0/05 - AP11
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.5!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Gi1/0/06 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.6!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Gi1/0/07 - video/mus/usersw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.7!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Gi1/0/08 - presenter/usersw
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10!-r " (1|2)$"!-l ifOperStatus 
+	notifications_enabled 0
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Gi1/0/09 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Gi1/0/10 
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 mussw 
+ 	 service_description 	 Vlan100
+ 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.52802!-r 1!-l ifOperStatus 
+ 	 } 
+
--- a/monitoring/nagios3/scripts/check_rtmp.sh
+++ b/monitoring/nagios3/scripts/check_rtmp.sh
@ -0,0 +1,96 @@
+#!/bin/sh
+# FILE: "check_rtmp"
+# DESCRIPTION:nagios plugin for checking rtmp streams.
+# REQUIRES: rtmpdump (http://rtmpdump.mplayerhq.hu/)
+# AUTHOR: Toni Comerma
+# DATE: jan-2013
+# $Id:$
+#
+
+PROGNAME=`readlink -f $0`
+PROGPATH=`echo $PROGNAME | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+REVISION=`echo '$Revision: .2 $' | sed -e 's/[^0-9.]//g'`
+
+RTMPDUMP=`which rtmpdump`
+
+print_usage() {
+  echo "Usage:"
+  echo "  $PROGNAME -u <url> -t <timeout> "
+  echo "  $PROGNAME -h "
+
+  
+}
+
+print_help() {
+  print_revision $PROGNAME $REVISION
+  echo ""
+  print_usage
+  
+	echo "Comprova l'estat d'un stream RTMP"
+	echo ""
+	echo "Opcions:"
+	echo "	-u URL a testejar Exemple: rtmp://server/app/streamName"
+	echo "	-t Temps a monitoritzar"
+	echo ""
+  exit $STATE_UNKNOWN
+}
+
+
+
+STATE_OK=0
+STATE_WARNING=1
+STATE_CRITICAL=2
+STATE_UNKNOWN=3
+
+URL=""
+TIMEOUT=2
+
+# Proces de parametres
+while getopts ":u:t:h" Option
+do
+	case $Option in 
+		u ) URL=$OPTARG;;
+		t ) TIMEOUT=$OPTARG;;
+		h ) print_help;;
+		* ) echo "unimplemented option";;
+		
+		esac
+done
+
+if [ ! $URL ] ; then 
+	echo " Error - No URL was specified."
+	echo ""
+	print_help
+	echo ""
+fi
+
+# Construir noms de fitxers temporals
+NAME=`echo $URL | sed -e s/[^A-Za-z0-9.]/_/g`
+ERR=/tmp/check_rtmp_err_$NAME.tmp
+
+# Testejant
+( $RTMPDUMP -m 4 --live -r $URL --stop $TIMEOUT > /dev/null 2> $ERR ) & sleep 5; kill $! 2> /dev/null
+status=$?
+
+
+# Retorn de resultats
+CONNECTA=`grep "INFO: Connected" $ERR`
+
+if [ -z "$CONNECTA" ]
+then
+  echo "CRITICAL - Cannot connect to the stream: $URL"
+  exit $STATE_CRITICAL
+else
+   ERROR=`grep "INFO: Metadata:" $ERR`
+   if [ ! -z "$ERROR" ]
+   then
+       echo "OK - stream is normal: $URL"
+       exit $STATE_OK
+    fi
+    echo "CRITICAL - Stream is not broadcasting: $URL"
+    exit $STATE_CRITICAL
+fi
+
+echo "UNKNOWN - Unknown output from stream check. Manual check is advised"
+exit $STATE_UNKNOWN
+
--- a/monitoring/nagios3/scripts/count-streams.sh
+++ b/monitoring/nagios3/scripts/count-streams.sh
@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# count streams in rtmp
+
+# get stream count
+stream_count=`curl -sfq -m1 http://stream.openfest.org/stats | xsltproc /usr/local/bin/count-streams.xsl -`
+
+_warn=${1:-3}
+_crit=${2:-6}
+
+
+_res='3'
+_data='UNKNOWN - something shitty happened'
+
+if [ $stream_count -ge $_crit ] ; then
+	_data="OK - stream count $stream_count"
+	_res=0
+fi
+
+if [ $stream_count -ge $_crit -a $stream_count -le $_warn ] ; then
+	_data="WARN - stream count $stream_count, less than expected. Min $_crit, needed $_warn"
+	_res=1
+fi
+
+if [ $stream_count -lt $_crit ] ; then
+	_data="CRITICAL - Streams lower than $_crit"
+	_res=2
+fi
+
+echo $_data
+exit $_res
--- a/monitoring/nagios3/scripts/count-streams.xsl
+++ b/monitoring/nagios3/scripts/count-streams.xsl
@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:output method="text" />
+	<xsl:template match="/">
+		<xsl:value-of select="count(/rtmp/server/application/live/stream)"/>
+	</xsl:template>
+</xsl:transform>
--- a/monitoring/snmp/README.md
+++ b/monitoring/snmp/README.md
@ -0,0 +1,6 @@
+# Monitor snmp traps in nagios
+How to monitor snmp traps in nagios
+
+http://paulgporter.net/2013/09/16/nagios-snmp-traps/
+
+convert only mibs you need/want
--- a/monitoring/snmp/snmptrapd.conf
+++ b/monitoring/snmp/snmptrapd.conf
@ -0,0 +1,8 @@
+# no auth at all (maybe not working)
+disableAuthorization yes
+
+# add our community with full rights
+authCommunity log,execute,net 0penfest
+
+# handle everything
+traphandle default /usr/sbin/snmptthandler
--- a/monitoring/snmp/snmptt.conf.cisco
+++ b/monitoring/snmp/snmptt.conf.cisco
@ -0,0 +1,20 @@
+# this is just a sample converted mib. follow the procedure in README.md
+EVENT ccmCLIRunningConfigChanged .1.3.6.1.4.1.9.9.43.2.0.2 "Status Events" Normal
+FORMAT This notification indicates that the running $*
+EXEC /usr/share/nagios3/plugins/eventhandlers/submit_check_result $r TRAP 2 "This notification indicates that the running $*"
+SDESC
+This notification indicates that the running
+configuration of the managed system has changed
+from the CLI.
+If the managed system supports a separate 
+configuration mode(where the configuration commands 
+are entered under a  configuration session which 
+affects the running configuration of the system), 
+then this notification is sent when the configuration 
+mode is exited.
+During this configuration session there can be 
+one or more running configuration changes.
+Variables:
+  1: ccmHistoryRunningLastChanged
+  2: ccmHistoryEventTerminalType
+EDESC
--- a/monitoring/snmp/snmptt.ini
+++ b/monitoring/snmp/snmptt.ini
@ -0,0 +1,95 @@
+[General]
+snmptt_system_name = 
+
+# way to run it (daemon to read spooled traps from snmptthandler)
+mode = daemon
+multiple_event = 1
+dns_enable = 0
+strip_domain = 1
+
+# nuke this domain substring
+strip_domain_list = <<END
+openfest.org
+END
+
+resolve_value_ip_addresses = 0
+
+# needed!!!!
+net_snmp_perl_enable = 1
+net_snmp_perl_cache_enable = 1
+net_snmp_perl_best_guess = 0
+translate_log_trap_oid = 0
+translate_value_oids = 1
+translate_enterprise_oid_format = 1
+translate_trap_oid_format = 1
+translate_varname_oid_format = 1
+translate_integers = 1
+wildcard_expansion_separator = " "
+allow_unsafe_regex = 0
+remove_backslash_from_quotes = 0
+dynamic_nodes = 0
+description_mode = 0
+description_clean = 1
+threads_enable = 0
+threads_max = 10
+
+# YEAAAH
+[DaemonMode]
+daemon_fork = 1
+daemon_uid = snmptt
+pid_file = /var/run/snmptt.pid
+spool_directory = /var/spool/snmptt/
+sleep = 5
+use_trap_time = 1
+keep_unlogged_traps = 1
+duplicate_trap_window = 5
+
+# Logging
+[Logging]
+stdout_enable = 0
+log_enable = 1
+log_file = /var/log/snmptt/snmptt.log
+log_system_enable = 1
+log_system_file = /var/log/snmptt/snmpttsystem.log
+
+# really valuable when debugging
+unknown_trap_log_enable = 1
+unknown_trap_log_file = /var/log/snmptt/snmpttunknown.log
+statistics_interval = 3600
+syslog_enable = 1
+syslog_facility = local0
+syslog_level_debug = <<END
+END
+syslog_level_info = <<END
+END
+syslog_level_notice = <<END
+END
+syslog_level_warning = <<END
+END
+syslog_level_err = <<END
+END
+syslog_level_crit = <<END
+END
+syslog_level_alert = <<END
+END
+syslog_level = warning
+syslog_system_enable = 1
+syslog_system_facility = local0
+syslog_system_level = warning
+[Exec]
+exec_enable = 1
+pre_exec_enable = 1
+unknown_trap_exec = 
+unknown_trap_exec_format = 
+exec_escape = 1
+[Debugging]
+DEBUGGING = 0
+DEBUGGING_FILE = 
+DEBUGGING_FILE_HANDLER = 
+
+# trap files with what to do
+[TrapFiles]
+snmptt_conf_files = <<END
+/etc/snmp/snmptt.conf
+/etc/snmp/snmptt.conf.cisco
+END
--- a/monitoring/tessera/README.md
+++ b/monitoring/tessera/README.md
@ -0,0 +1,7 @@
+# Tessera
+Tessera is a nice JS dashboard
+
+# Prerequisites
+ * uwsgi
+ * nginx and separate vhost or port. Tessera does not run nice from subdir
+ * python-virtualenv
--- a/monitoring/tessera/dashboards/internet-connectivity.json
+++ b/monitoring/tessera/dashboards/internet-connectivity.json
@ -0,0 +1,272 @@
+{
+  "id": 2,
+  "title": "Internet Connectivity",
+  "category": "Data",
+  "summary": "",
+  "description": "",
+  "creation_date": "2015-09-20T14:47:17.870112Z",
+  "last_modified_date": "2015-11-07T20:58:59.943634Z",
+  "imported_from": null,
+  "tags": [],
+  "definition": {
+    "options": {},
+    "item_type": "dashboard_definition",
+    "item_id": "d3",
+    "items": [
+      {
+        "title": "Uplink",
+        "item_type": "section",
+        "item_id": "d4",
+        "items": [
+          {
+            "item_type": "row",
+            "item_id": "d27",
+            "items": [
+              {
+                "item_type": "cell",
+                "item_id": "d28",
+                "items": [
+                  {
+                    "item_type": "heading",
+                    "item_id": "d29",
+                    "text": "TX",
+                    "level": 1
+                  }
+                ],
+                "span": 6
+              },
+              {
+                "item_type": "cell",
+                "item_id": "d30",
+                "items": [
+                  {
+                    "item_type": "heading",
+                    "item_id": "d31",
+                    "text": "RX",
+                    "level": 1
+                  }
+                ],
+                "span": 3
+              }
+            ]
+          },
+          {
+            "item_type": "row",
+            "item_id": "d9",
+            "items": [
+              {
+                "item_type": "cell",
+                "item_id": "d10",
+                "items": [
+                  {
+                    "title": "Peak Rate",
+                    "item_type": "jumbotron_singlestat",
+                    "item_id": "d11",
+                    "query": "uplink_tx",
+                    "format": ",.3s",
+                    "transform": "max",
+                    "units": "bps"
+                  }
+                ],
+                "span": 4
+              },
+              {
+                "item_type": "cell",
+                "item_id": "d12",
+                "items": [
+                  {
+                    "title": "Mean Rate",
+                    "item_type": "singlestat",
+                    "item_id": "d13",
+                    "query": "uplink_tx",
+                    "format": ",.3s",
+                    "transform": "mean",
+                    "units": "bps"
+                  },
+                  {
+                    "title": "Current Rate",
+                    "item_type": "singlestat",
+                    "item_id": "d14",
+                    "query": "uplink_tx",
+                    "format": ",.3s",
+                    "transform": "last_non_zero",
+                    "units": "bps"
+                  }
+                ],
+                "span": 2
+              },
+              {
+                "item_type": "cell",
+                "item_id": "d20",
+                "items": [
+                  {
+                    "title": "Peak Rate",
+                    "item_type": "jumbotron_singlestat",
+                    "item_id": "d21",
+                    "query": "uplink_rx",
+                    "format": ",.3s",
+                    "transform": "max",
+                    "units": "bps"
+                  }
+                ],
+                "span": 4
+              },
+              {
+                "item_type": "cell",
+                "item_id": "d22",
+                "items": [
+                  {
+                    "title": "Mean Rate",
+                    "item_type": "singlestat",
+                    "item_id": "d23",
+                    "query": "uplink_rx",
+                    "format": ",.3s",
+                    "transform": "mean",
+                    "units": "bps"
+                  },
+                  {
+                    "title": "Current Rate",
+                    "item_type": "singlestat",
+                    "item_id": "d24",
+                    "query": "uplink_rx",
+                    "format": ",.3s",
+                    "transform": "last_non_zero",
+                    "units": "bps"
+                  }
+                ],
+                "span": 2
+              }
+            ]
+          },
+          {
+            "item_type": "row",
+            "item_id": "d5",
+            "items": [
+              {
+                "item_type": "cell",
+                "item_id": "d6",
+                "items": [
+                  {
+                    "title": "",
+                    "options": {
+                      "palette": "tableau10",
+                      "y1": {
+                        "label": "bps"
+                      }
+                    },
+                    "item_type": "bar_chart",
+                    "item_id": "d8",
+                    "height": 4,
+                    "query": "uplink_combined",
+                    "legend": "none",
+                    "hide_zero_series": false,
+                    "stack_mode": "none"
+                  }
+                ],
+                "span": 12
+              }
+            ]
+          }
+        ],
+        "level": 1,
+        "horizontal_rule": false,
+        "layout": "fixed"
+      }
+    ],
+    "queries": {
+      "stations": {
+        "name": "stations",
+        "targets": [
+          "received.*.iwinfo-wlan*.stations.value"
+        ]
+      },
+      "uplink_combined": {
+        "name": "uplink_combined",
+        "targets": [
+          "group(scale(perSecond(received.eric.interface-eth1_50.if_octets.tx),8),\n                            scale(perSecond(received.eric.interface-eth1_50.if_octets.rx),-8))"
+        ]
+      },
+      "uplink_rx": {
+        "name": "uplink_rx",
+        "targets": [
+          "scale(perSecond(received.eric.interface-eth1_50.if_octets.rx),8)"
+        ]
+      },
+      "uplink_tx": {
+        "name": "uplink_tx",
+        "targets": [
+          "scale(perSecond(received.eric.interface-eth1_50.if_octets.tx),8)"
+        ]
+      },
+      "video_combined": {
+        "name": "video_combined",
+        "targets": [
+          "group(scale(perSecond(received.eric.interface-eth1_203.if_octets.tx),8), scale(perSecond(received.eric.interface-eth1_203.if_octets.rx),-8))"
+        ]
+      },
+      "video_rx": {
+        "name": "video_rx",
+        "targets": [
+          "scale(perSecond(received.eric.interface-eth1_203.if_octets.rx),8)"
+        ]
+      },
+      "video_tx": {
+        "name": "video_tx",
+        "targets": [
+          "scale(perSecond(received.eric.interface-eth1_203.if_octets.tx),8)"
+        ]
+      },
+      "wifi_noise": {
+        "name": "wifi_noise",
+        "targets": [
+          "dBmtomW(received.*.iwinfo-wlan*.signal_noise.value)"
+        ]
+      },
+      "wifi_noise_dbm": {
+        "name": "wifi_noise_dbm",
+        "targets": [
+          "received.*.iwinfo-wlan*.signal_noise.value"
+        ]
+      },
+      "wired_combined": {
+        "name": "wired_combined",
+        "targets": [
+          "group(scale(perSecond(received.eric.interface-eth1_201.if_octets.tx),8), scale(perSecond(received.eric.interface-eth1_201.if_octets.rx),-8))"
+        ]
+      },
+      "wired_rx": {
+        "name": "wired_rx",
+        "targets": [
+          "scale(perSecond(received.eric.interface-eth1_201.if_octets.rx),8)"
+        ]
+      },
+      "wired_tx": {
+        "name": "wired_tx",
+        "targets": [
+          "scale(perSecond(received.eric.interface-eth1_201.if_octets.tx),8)"
+        ]
+      },
+      "wireless_combined": {
+        "name": "wireless_combined",
+        "targets": [
+          "group(scale(perSecond(received.eric.interface-eth1_202.if_octets.tx),8), scale(perSecond(received.eric.interface-eth1_202.if_octets.rx),-8))"
+        ]
+      },
+      "wireless_rx": {
+        "name": "wireless_rx",
+        "targets": [
+          "scale(perSecond(received.eric.interface-eth1_202.if_octets.rx),8)"
+        ]
+      },
+      "wireless_tx": {
+        "name": "wireless_tx",
+        "targets": [
+          "scale(perSecond(received.eric.interface-eth1_202.if_octets.tx),8)"
+        ]
+      }
+    }
+  },
+  "href": "/api/dashboard/2",
+  "view_href": "/dashboards/2/internet-connectivity",
+  "definition_href": "/api/dashboard/2/definition"
+}
--- a/monitoring/tessera/dashboards/wireless-stats.json
+++ b/monitoring/tessera/dashboards/wireless-stats.json
@ -0,0 +1,173 @@
+{
+  "id": 3,
+  "title": "Wireless",
+  "category": "Data",
+  "summary": "",
+  "description": "",
+  "creation_date": "2015-11-07T06:32:41.530934Z",
+  "last_modified_date": "2015-11-07T22:08:31.369260Z",
+  "imported_from": null,
+  "tags": [],
+  "definition": {
+    "options": {},
+    "item_type": "dashboard_definition",
+    "item_id": "d3",
+    "items": [
+      {
+        "item_type": "section",
+        "item_id": "d4",
+        "items": [
+          {
+            "item_type": "row",
+            "item_id": "d5",
+            "items": [
+              {
+                "item_type": "cell",
+                "item_id": "d13",
+                "items": [
+                  {
+                    "options": {
+                      "palette": "tableau10"
+                    },
+                    "item_type": "bar_chart",
+                    "item_id": "d14",
+                    "height": 4,
+                    "query": "stations",
+                    "legend": "none",
+                    "hide_zero_series": false,
+                    "stack_mode": "stack"
+                  }
+                ],
+                "span": 12
+              }
+            ]
+          },
+          {
+            "item_type": "row",
+            "item_id": "d8",
+            "items": [
+              {
+                "item_type": "cell",
+                "item_id": "d9",
+                "items": [
+                  {
+                    "title": "5GHz vs 2.4GHz",
+                    "options": {
+                      "palette": "tableau10",
+                      "y1": {
+                        "label": "Stations"
+                      }
+                    },
+                    "item_type": "bar_chart",
+                    "item_id": "d10",
+                    "query": "stations2_5",
+                    "legend": "simple",
+                    "hide_zero_series": false,
+                    "stack_mode": "none"
+                  },
+                  {
+                    "item_type": "markdown",
+                    "item_id": "d15",
+                    "text": "The number of 5GHz associations (positive numbers) vs the number of 2.4 GHz associations (negative).",
+                    "raw": false
+                  }
+                ],
+                "span": 12
+              }
+            ]
+          },
+          {
+            "item_type": "row",
+            "item_id": "d16",
+            "items": [
+              {
+                "item_type": "cell",
+                "item_id": "d17",
+                "items": [
+                  {
+                    "title": "Stations in Per Hall",
+                    "options": {
+                      "palette": "numbers6",
+                      "y1": {
+                        "label": "Stations"
+                      }
+                    },
+                    "item_type": "bar_chart",
+                    "item_id": "d18",
+                    "query": "stations_for_domain",
+                    "legend": "simple",
+                    "hide_zero_series": false,
+                    "stack_mode": "stack"
+                  }
+                ],
+                "span": 12
+              }
+            ]
+          }
+        ],
+        "level": 1,
+        "horizontal_rule": false,
+        "layout": "fixed"
+      }
+    ],
+    "queries": {
+      "stations": {
+        "name": "stations",
+        "targets": [
+          "sumSeries(received.ap-*.iwinfo-wlan*.stations.value)"
+        ]
+      },
+      "stations2_5": {
+        "name": "stations2_5",
+        "targets": [
+          "group(sumSeries(received.ap-*-ac.iwinfo-wlan0.stations.value, received.ap-*-an.iwinfo-wlan1.stations.value),\nscale(sumSeries(received.ap-*-legacy.iwinfo-wlan0.stations.value),-1), scale(sumSeries(received.ap-*-ac.iwinfo-wlan1.stations.value, received.ap-*-an.iwinfo-wlan0.stations.value),-1))"
+        ]
+      },
+      "stations_bulgaria": {
+        "name": "stations_bulgaria",
+        "targets": [
+          "sumSeries(received.ap-bulgaria-*.iwinfo-wlan*.stations.value)"
+        ]
+      },
+      "stations_chamber": {
+        "name": "stations_chamber",
+        "targets": [
+          "sumSeries(received.ap-chamber-*.iwinfo-wlan*.stations.value)"
+        ]
+      },
+      "stations_for_domain": {
+        "name": "stations_for_domain",
+        "targets": [
+          "group(sumSeries(received.ap-bulgaria-*.iwinfo-wlan*.stations.value),\nsumSeries(received.ap-lobby1-*.iwinfo-wlan*.stations.value),\nsumSeries(received.ap-chamber-*.iwinfo-wlan*.stations.value),\nsumSeries(received.ap-marble-*.iwinfo-wlan*.stations.value),\nsumSeries(received.ap-music-*.iwinfo-wlan*.stations.value),\nsumSeries(received.ap-lobby2-*.iwinfo-wlan*.stations.value))"
+        ]
+      },
+      "stations_lobby1": {
+        "name": "stations_lobby1",
+        "targets": [
+          "sumSeries(received.ap-lobby1-*.iwinfo-wlan*.stations.value)"
+        ]
+      },
+      "stations_lobby2": {
+        "name": "stations_lobby2",
+        "targets": [
+          "sumSeries(received.ap-lobby2-*.iwinfo-wlan*.stations.value)"
+        ]
+      },
+      "stations_marble": {
+        "name": "stations_marble",
+        "targets": [
+          "sumSeries(received.ap-marble-*.iwinfo-wlan*.stations.value)"
+        ]
+      },
+      "stations_music": {
+        "name": "stations_music",
+        "targets": [
+          "sumSeries(received.ap-music-*.iwinfo-wlan*.stations.value)"
+        ]
+      }
+    }
+  },
+  "href": "/api/dashboard/3",
+  "view_href": "/dashboards/3/wireless",
+  "definition_href": "/api/dashboard/3/definition"
+}
--- a/monitoring/tessera/nginx/tessera-vhost
+++ b/monitoring/tessera/nginx/tessera-vhost
@ -0,0 +1,24 @@
+server {
+	server_name tessera.openfest.org;
+
+	listen 80;
+	listen [::]:80;
+
+	root /var/www/html;
+	client_max_body_size 500M;
+
+	location / {
+		limit_except GET{
+			auth_basic "NO";
+			auth_basic_user_file "/etc/tessera/htpasswd.users";
+		}
+		try_files $uri @tessera;
+	}
+
+	location @tessera {
+		include uwsgi_params;
+#		uwsgi_param SCRIPT_NAME tessera;
+		uwsgi_modifier1 30;
+		uwsgi_pass 127.0.0.1:3032;
+	}
+}
--- a/monitoring/tessera/uwsgi/tessera.ini
+++ b/monitoring/tessera/uwsgi/tessera.ini
@ -0,0 +1,11 @@
+[uwsgi]
+processes = 2
+socket = 127.0.0.1:3032
+gid = www-data
+uid = www-data
+chdir = /opt/tessera-pip/lib/python2.7/site-packages/tessera
+#wsgi-file = /opt/graphite/conf/graphite.wsgi
+home = /opt/tessera-pip
+py-program-name = /opt/tessera-pip/bin/python
+module = tessera
+callable = app
--- a/supporting-materials/README.md
+++ b/supporting-materials/README.md
@ -0,0 +1,7 @@
+# Supporting materials
+Stuff that is needed for some of the functionality but does not fit in it's own place
+
+# MIB's
+MIB files for snmp traps
+
+NOTE: TP-LINK ones are just mgmt mibs. No trap definitions so mostly useless. Rely on basics (SMI/TC/TS)
--- a/supporting-materials/cisco-mibs/v1.tar.gz
+++ b/supporting-materials/cisco-mibs/v1.tar.gz
--- a/supporting-materials/cisco-mibs/v2.tar.gz
+++ b/supporting-materials/cisco-mibs/v2.tar.gz
--- a/supporting-materials/tplink-mibs/TL-SG3210_V2_MIB_150714.zip
+++ b/supporting-materials/tplink-mibs/TL-SG3210_V2_MIB_150714.zip
Author	SHA1	Message	Date
Vladimir Vitkov	6d154a3c89	tessera - graphing dashboard * nginx vhost * uwsgi app server * dashboards	2015-11-10 16:08:40 +02:00
Vladimir Vitkov	8f4eb6de1f	snmp - adding snmptrapd and snmptt configurations	2015-11-10 16:00:07 +02:00
Vladimir Vitkov	014416ba10	nagios3 - custom check scripts	2015-11-10 15:49:52 +02:00
Vladimir Vitkov	e0ae25569a	nagios3 - reorganize to look better	2015-11-10 15:49:22 +02:00
Vladimir Vitkov	787e8222f9	nagios3 - add essentials	2015-11-10 15:45:35 +02:00
Vladimir Vitkov	a90f8076d8	collectd - improvements/additions * enable unix socket for nagios monitoring * Add data collection for unbound	2015-11-10 15:14:52 +02:00
Vladimir Vitkov	ef4934efb7	communication - slacksync bot config update	2015-11-10 15:04:48 +02:00
Vladimir Vitkov	b57c9b8064	supporting stuff - mibs	2015-11-05 20:32:53 +02:00
Vladimir Vitkov	6d99e421e9	ArpWatch - add config * Full config for arpwatch * Closes #49	2015-11-05 19:59:53 +02:00
Vladimir Vitkov	544be60a0d	Merge branch 'master' of github.com:OpenFest/openfest-network	2015-11-03 16:54:04 +02:00
Vladimir Vitkov	406b88e284	collectd - monitoring switches	2015-11-03 16:53:55 +02:00
Vladimir Vitkov	68a6c3f09a	graphite - swtch monitoring via snmp * Add custom storage schema * add rewrites for unification etc	2015-11-03 16:49:04 +02:00