commit e9ac4730c0bac553abffd5f587e82540d789e313
author Filip Pytloun <fpytloun@mirantis.com> Mon May 22 10:01:39 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Mon May 22 10:01:39 2017 +0000
tree c7c175a015bab2f3be592ffdc8d084499d899d17
parent a50a2c321d43f5144f1e9db6b8963841d6ae45ae
parent 03e98f936a626370f403c480436ab878e39189d1

Merge "Prefer point timestamp in InfluxDB accumulator"

heka/files/lua/filters/influxdb_accumulator.lua

diff --git a/heka/files/lua/filters/influxdb_accumulator.lua b/heka/files/lua/filters/influxdb_accumulator.lua
index 470bdef..9bdeec8 100644
--- a/heka/files/lua/filters/influxdb_accumulator.lua
+++ b/heka/files/lua/filters/influxdb_accumulator.lua
@@ -111,9 +111,10 @@
                 point.tags[k] = v
             end
         end
+
         accumulator:append(
             encoder:encode_datapoint(
-                msg_timestamp,
+                point["timestamp"] or msg_timestamp,
                 point.name,
                 point.value or point.values,
                 point.tags))