openstack/kolla
Code Issues Proposed changes

Merge "add sahara log in heka"

Browse Source
This commit is contained in:
Jenkins 2016-10-08 07:42:53 +00:00 committed by Gerrit Code Review
commit 9a35c0e679
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/common/templates/cron-logrotate-sahara.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/sahara/*.log"
{
}

1
ansible/roles/common/templates/cron.json.j2
View File

@ -19,6 +19,7 @@
( 'neutron', enable_neutron ),
( 'nova', enable_nova ),
( 'rabbitmq', enable_rabbitmq ),
( 'sahara', enable_sahara ),
( 'senlin', enable_senlin ),
( 'swift', enable_swift )
] %}

2
ansible/roles/common/templates/heka-openstack.toml.j2
View File

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