New threaf-safe netapp collectors

Adding new netapp disk collector and refactoring another collector.