Merge "Add timezone to openstack log decoder config" into stacklight
diff --git a/nova/meta/heka.yml b/nova/meta/heka.yml
index 9d4a187..6c317a1 100644
--- a/nova/meta/heka.yml
+++ b/nova/meta/heka.yml
@@ -18,8 +18,8 @@
input:
nova_log:
engine: logstreamer
- log_directory: "/var/log/nova"
- file_match: '(?P<Service>.+)\.log\.?(?P<Seq>\d*)$'
+ log_directory: "/var/log"
+ file_match: 'nova/(?P<Service>.+)\.log\.?(?P<Seq>\d*)$'
differentiator: ['nova', '_', 'Service']
priority: ["^Seq"]
decoder: "nova_decoder"
@@ -27,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"