diff --git a/monitoring/graphite/graphite-conf/rewrite-rules.conf b/monitoring/graphite/graphite-conf/rewrite-rules.conf
index c3167ed..a24c0d5 100644
--- 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
diff --git a/monitoring/graphite/graphite-conf/storage-schemas.conf b/monitoring/graphite/graphite-conf/storage-schemas.conf
index 47cf1a4..450176f 100644
--- 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 = .*