Merge "add sahara log in heka"

ansible/roles/common/templates/cron-logrotate-sahara.conf.j2

+"/var/log/kolla/sahara/*.log"
+{
+}

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 )
 ] %}

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"]