aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-05 15:36:44 +0000
committerGerrit Code Review <review@openstack.org>2016-03-05 15:36:44 +0000
commit08101fd4654ffbf7ca6331427a5d895b1db0f008 (patch)
tree464a25578777a5a8e8fee7d2fd712f69c9abc528 /docker
parent8976263153f7fe7d294df74a49b3f5d9fbcd68ed (diff)
parent491aff0b88bc3dac13ea9180c952854fd0a67684 (diff)
downloadkolla-08101fd4654ffbf7ca6331427a5d895b1db0f008.tar.gz
kolla-08101fd4654ffbf7ca6331427a5d895b1db0f008.zip
Merge "Make Heka send logs to Elasticsearch"
Diffstat (limited to 'docker')
-rw-r--r--docker/heka/plugins/decoders/os_swift_log.lua2
-rw-r--r--docker/heka/plugins/decoders/os_syslog.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/heka/plugins/decoders/os_swift_log.lua b/docker/heka/plugins/decoders/os_swift_log.lua
index 440e9ab08..0296f6e23 100644
--- a/docker/heka/plugins/decoders/os_swift_log.lua
+++ b/docker/heka/plugins/decoders/os_swift_log.lua
@@ -20,7 +20,7 @@ local utils = require "os_utils"
local msg = {
Timestamp = nil,
- Type = 'Syslog',
+ Type = 'log',
Hostname = read_config("hostname"),
Payload = nil,
Pid = nil,
diff --git a/docker/heka/plugins/decoders/os_syslog.lua b/docker/heka/plugins/decoders/os_syslog.lua
index 34fdd0bcb..94e2744f8 100644
--- a/docker/heka/plugins/decoders/os_syslog.lua
+++ b/docker/heka/plugins/decoders/os_syslog.lua
@@ -20,7 +20,7 @@ local utils = require "os_utils"
local msg = {
Timestamp = nil,
- Type = 'Syslog',
+ Type = 'log',
Hostname = read_config("hostname"),
Payload = nil,
Pid = nil,