diff --git a/opencontrail/files/grafana_dashboards/contrail_influxdb.json b/opencontrail/files/grafana_dashboards/contrail_influxdb.json
index 9441fa7..14c122b 100644
--- a/opencontrail/files/grafana_dashboards/contrail_influxdb.json
+++ b/opencontrail/files/grafana_dashboards/contrail_influxdb.json
@@ -375,7 +375,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "openstack_check_local_api",
+              "measurement": "http_check",
               "policy": "default",
               "rawQuery": false,
               "refId": "A",
@@ -3398,7 +3398,7 @@
         "multi": true,
         "name": "server",
         "options": [],
-        "query": "show tag values from openstack_check_local_api with key = hostname where environment_label =~ /^$environment$/ and service =~ /^contrail/",
+        "query": "show tag values from http_check with key = hostname where environment_label =~ /^$environment$/ and service =~ /^contrail/",
         "refresh": 1,
         "refresh_on_load": true,
         "regex": "",
diff --git a/opencontrail/meta/collectd.yml b/opencontrail/meta/collectd.yml
index 9cce855..ab0d75c 100644
--- a/opencontrail/meta/collectd.yml
+++ b/opencontrail/meta/collectd.yml
@@ -103,8 +103,8 @@
     {%- endif %}
   {%- endif %}
   {%- if config.get('enabled', False) or collector.get('enabled', False) or compute.get('enabled', False) %}
-  collectd_check_local_endpoint:
-    endpoint:
+  collectd_http_check:
+    url:
     {%- if config.get('enabled', False) %}
       {%- set bind_addr=config.bind.address|replace('0.0.0.0', '127.0.0.1') %}
       contrail-api:
diff --git a/opencontrail/meta/heka.yml b/opencontrail/meta/heka.yml
index 330a6c0..a5cd0c9 100644
--- a/opencontrail/meta/heka.yml
+++ b/opencontrail/meta/heka.yml
@@ -185,7 +185,7 @@
       description: 'Contrail API is locally down'
       severity: down
       rules:
-      - metric: openstack_check_local_api
+      - metric: http_check
         field:
           service: contrail-api
         relational_operator: '=='
@@ -197,7 +197,7 @@
       description: 'Contrail Discovery API is locally down'
       severity: down
       rules:
-      - metric: openstack_check_local_api
+      - metric: http_check
         field:
           service: contrail-discovery
         relational_operator: '=='
@@ -209,7 +209,7 @@
       description: 'Contrail Collector API is locally down'
       severity: down
       rules:
-      - metric: openstack_check_local_api
+      - metric: http_check
         field:
           service: contrail-collector
         relational_operator: '=='
@@ -317,7 +317,7 @@
       description: 'Contrail Node Manager API is locally down'
       severity: down
       rules:
-      - metric: openstack_check_local_api
+      - metric: http_check
         field:
           service: contrail-node-manager
         relational_operator: '=='
@@ -329,7 +329,7 @@
       description: 'Contrail vrouter API is locally down'
       severity: down
       rules:
-      - metric: openstack_check_local_api
+      - metric: http_check
         field:
           service: contrail-vrouter
         relational_operator: '=='