diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index 81bea3a..5ad045a 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -374,8 +374,12 @@
   {%- if remote_collector.influxdb_host is defined %}
     influxdb:
       engine: http
+    {%- if remote_collector.influxdb_database is defined %}
       address: "http://{{ remote_collector.influxdb_host }}:{{ remote_collector.influxdb_port }}/write?db={{ remote_collector.influxdb_database }}&precision={{ remote_collector.influxdb_time_precision }}"
-    {%- if remote_collector.influxdb_username and remote_collector.influxdb_password %}
+    {%- else %}
+      address: "http://{{ remote_collector.influxdb_host }}:{{ remote_collector.influxdb_port }}/write?precision={{ remote_collector.influxdb_time_precision }}"
+    {%- endif %}
+    {%- if remote_collector.influxdb_username is defined and remote_collector.influxdb_password is defined %}
       username: "{{ remote_collector.influxdb_username }}"
       password: "{{ remote_collector.influxdb_password }}"
     {%- endif %}
diff --git a/metadata/service/remote_collector/output/telegraf.yml b/metadata/service/remote_collector/output/telegraf.yml
new file mode 100644
index 0000000..5097651
--- /dev/null
+++ b/metadata/service/remote_collector/output/telegraf.yml
@@ -0,0 +1,6 @@
+parameters:
+  heka:
+    remote_collector:
+      influxdb_host: ${_param:remote_collector_telegraf_host}
+      influxdb_port: 8186
+      influxdb_timeout: 2000