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 }}"
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:
diff --git a/opencontrail/meta/heka.yml b/opencontrail/meta/heka.yml
index 16cbaeb..069dd0f 100644
--- a/opencontrail/meta/heka.yml
+++ b/opencontrail/meta/heka.yml
@@ -59,6 +59,11 @@
       module_file: /usr/share/lma_collector/decoders/cassandra.lua
       module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
       adjust_timezone: true
+    ifmap:
+      engine: sandbox
+      module_file: /usr/share/lma_collector/decoders/ifmap.lua
+      module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
+      adjust_timezone: true
 {%- endif %}
 {%- if web_ref is defined %}
     redis:
@@ -117,6 +122,14 @@
       priority: ["^Seq"]
       decoder: "cassandra_decoder"
       splitter: "java_splitter"
+    ifmap:
+      engine: logstreamer
+      log_directory: "/var/log"
+      file_match: 'contrail/ifmap-(?P<Service>server.*)\.log\.?(?P<Seq>\d*)$'
+      differentiator: ['contrail.ifmap', '.', 'Service']
+      priority: ["^Seq"]
+      decoder: "ifmap_decoder"
+      splitter: "java_splitter"
 {%- endif %}
     contrail_main_log:
       engine: logstreamer