Move the SNMP close back to the polling sub
Finish the model matching for Graphite