Merge "Fix InfluxDB line protocol encoder"
diff --git a/heka/files/lua/decoders/metric.lua b/heka/files/lua/decoders/metric.lua
index 75cec5e..963f827 100644
--- a/heka/files/lua/decoders/metric.lua
+++ b/heka/files/lua/decoders/metric.lua
@@ -15,22 +15,11 @@
require "cjson"
require "string"
-local l = require 'lpeg'
-l.locale(l)
-
-local split_on_space = l.Ct( (l.C((l.P(1) - l.space)^1) * l.space^0)^1 * -1)
-local sources_list = split_on_space:match(read_config('deserialize_for_sources') or '')
-
-local sources = {}
-for _, s in ipairs(sources_list) do
- sources[s] = true
-end
-
local utils = require 'lma_utils'
function process_message ()
local msg = decode_message(read_message("raw"))
- if string.match(msg.Type, 'bulk_metric$') and sources[msg.Fields.source] then
+ if string.match(msg.Type, 'bulk_metric$') then
local ok, metrics = pcall(cjson.decode, msg.Payload)
if not ok then
diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index 12c0c63..5ad8722 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -109,8 +109,6 @@
engine: sandbox
module_file: /usr/share/lma_collector/decoders/metric.lua
module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
- config:
- deserialize_for_sources: 'log_collector'
input:
heka_collectd:
engine: http