Merge pull request #40 from obourdon/master

Fix for uniformization of metric names
diff --git a/collectd/files/plugin/contrail_ifmap_elements_count.py b/collectd/files/plugin/contrail_ifmap_elements_count.py
index a9831d2..da9fd9d 100644
--- a/collectd/files/plugin/contrail_ifmap_elements_count.py
+++ b/collectd/files/plugin/contrail_ifmap_elements_count.py
@@ -22,7 +22,7 @@
 import sys
 
 plugin_name = "contrail"
-plugin_instance = "ifmap-elements-count"
+plugin_instance = "ifmap_elements_count"
 plugin_interval = 90
 plugin_type = 'gauge'
 
@@ -57,7 +57,6 @@
         plugin=plugin_name,  # metric source
         plugin_instance=plugin_instance,
         type=plugin_type,
-        type_instance=plugin_name,
         interval=plugin_interval,
         meta={'0': True},
         values=[value]