Merge "Fix collectd meta when the service is disabled" into stacklight
diff --git a/glance/meta/heka.yml b/glance/meta/heka.yml
index db9bf9e..cee8199 100644
--- a/glance/meta/heka.yml
+++ b/glance/meta/heka.yml
@@ -4,6 +4,7 @@
engine: sandbox
module_file: /usr/share/lma_collector/decoders/openstack_log.lua
module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
+ adjust_timezone: true
splitter:
glance:
engine: token
@@ -11,8 +12,8 @@
input:
glance_log:
engine: logstreamer
- log_directory: "/var/log/glance"
- file_match: '(?P<Service>.+)\.log\.?(?P<Seq>\d*)$'
+ log_directory: "/var/log"
+ file_match: 'glance/(?P<Service>.+)\.log\.?(?P<Seq>\d*)$'
differentiator: ['glance', '_', 'Service']
priority: ["^Seq"]
decoder: "glance_decoder"