From b46d625b52980b734b9da1dfeb06e35ade5956b4 Mon Sep 17 00:00:00 2001
From: zhubingbing <1392607554@qq.com>
Date: Fri, 7 Oct 2016 08:05:23 +0000
Subject: [PATCH] add sahara log in heka

Closes-Bug: #1631286

Change-Id: I874913a08e932766d9517bf4740de94146d7b5fb
---
 ansible/roles/common/templates/cron-logrotate-sahara.conf.j2 | 3 +++
 ansible/roles/common/templates/cron.json.j2                  | 1 +
 ansible/roles/common/templates/heka-openstack.toml.j2        | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 ansible/roles/common/templates/cron-logrotate-sahara.conf.j2

diff --git a/ansible/roles/common/templates/cron-logrotate-sahara.conf.j2 b/ansible/roles/common/templates/cron-logrotate-sahara.conf.j2
new file mode 100644
index 0000000000..57a98d315c
--- /dev/null
+++ b/ansible/roles/common/templates/cron-logrotate-sahara.conf.j2
@@ -0,0 +1,3 @@
+"/var/log/kolla/sahara/*.log"
+{
+}
diff --git a/ansible/roles/common/templates/cron.json.j2 b/ansible/roles/common/templates/cron.json.j2
index 85d0a1a4ff..7e1f4ab17a 100644
--- a/ansible/roles/common/templates/cron.json.j2
+++ b/ansible/roles/common/templates/cron.json.j2
@@ -19,6 +19,7 @@
     ( 'neutron', enable_neutron ),
     ( 'nova', enable_nova ),
     ( 'rabbitmq', enable_rabbitmq ),
+    ( 'sahara', enable_sahara ),
     ( 'senlin', enable_senlin ),
     ( 'swift', enable_swift )
 ] %}
diff --git a/ansible/roles/common/templates/heka-openstack.toml.j2 b/ansible/roles/common/templates/heka-openstack.toml.j2
index a31605618c..51a1535f42 100644
--- a/ansible/roles/common/templates/heka-openstack.toml.j2
+++ b/ansible/roles/common/templates/heka-openstack.toml.j2
@@ -6,6 +6,6 @@ filename = "lua_decoders/os_openstack_log.lua"
 type = "LogstreamerInput"
 decoder = "openstack_log_decoder"
 log_directory = "/var/log/kolla"
-file_match = '(?P<Service>cloudkitty|nova|glance|keystone|neutron|ceph|cinder|heat|murano|magnum|mistral|manila|senlin)/(?P<Program>.*)\.log\.?(?P<Seq>\d*)$'
+file_match = '(?P<Service>cloudkitty|nova|glance|keystone|neutron|ceph|cinder|heat|murano|magnum|mistral|manila|senlin|sahara)/(?P<Program>.*)\.log\.?(?P<Seq>\d*)$'
 priority = ["^Seq"]
 differentiator = ["Service", "_", "Program"]