Merge "Fix collectd meta when the service is disabled" into stacklight
diff --git a/nova/meta/heka.yml b/nova/meta/heka.yml
index 9373302..6c317a1 100644
--- a/nova/meta/heka.yml
+++ b/nova/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
{%- if pillar.nova.compute is defined %}
libvirt:
engine: sandbox
@@ -26,8 +27,8 @@
{%- if pillar.nova.compute is defined %}
libvirt_log:
engine: logstreamer
- log_directory: "/var/log/libvirt"
- file_match: 'libvirtd.log'
+ log_directory: "/var/log"
+ file_match: 'libvirt/libvirtd.log'
differentiator: ['libvirt']
decoder: "libvirt_decoder"
splitter: "TokenSplitter"