commit ce7fa221a0eb7c983744eb87f0b9db2bbb8212a0
author Olivier Bourdon <obourdon@mirantis.com> Thu Nov 24 23:15:08 2016 +0100
committer Olivier Bourdon <obourdon@mirantis.com> Fri Nov 25 08:22:45 2016 +0100
tree c14b474ba2520beccd4bbfe4725cbcc84887a9b7
parent 49098dc70ef345b2417a2eb610275408afe0b57e

Fix contrail metrics collection

Change-Id: I313204f6010fd3a9a1994598bc4f53afb060e05a

opencontrail/files/collectd_contrail_apis.conf

diff --git a/opencontrail/files/collectd_contrail_apis.conf b/opencontrail/files/collectd_contrail_apis.conf
index 5bfea5d..93ceee8 100644
--- a/opencontrail/files/collectd_contrail_apis.conf
+++ b/opencontrail/files/collectd_contrail_apis.conf
@@ -1,7 +1,7 @@
 
-Import "contrail_apis"
+Import "collectd_contrail_apis"
 
-<Module "contrail_apis">
+<Module "collectd_contrail_apis">
   {%- for api_check_name, api_check in plugin.api_checks.iteritems() %}
   {%- if api_check.url is defined and api_check.xml_element is defined %}
   Url "{{ api_check_name }}" "{{ api_check.url }}"

opencontrail/meta/collectd.yml

diff --git a/opencontrail/meta/collectd.yml b/opencontrail/meta/collectd.yml
index c1aab4f..02e0428 100644
--- a/opencontrail/meta/collectd.yml
+++ b/opencontrail/meta/collectd.yml
@@ -4,7 +4,7 @@
 local_plugin:
 {%- if control.get('enabled', False) %}
 {%- set bind_addr=control.bind.address|replace('0.0.0.0', '127.0.0.1') %}
-  contrail_apis:
+  collectd_contrail_apis:
     plugin: python
     template: opencontrail/files/collectd_contrail_apis.conf
     api_checks:
@@ -107,7 +107,7 @@
   contrail_ifmap_elements_count:
     plugin: python
     template: opencontrail/files/collectd_contrail_ifmap_elements_count.conf
-  contrail_apis:
+  collectd_contrail_apis:
     plugin: python
     template: opencontrail/files/collectd_contrail_apis.conf
     api_checks: