diff options
| author | zhubingbing <1392607554@qq.com> | 2016-10-07 08:05:23 +0000 |
|---|---|---|
| committer | zhubingbing <1392607554@qq.com> | 2016-10-07 13:18:03 +0000 |
| commit | b46d625b52980b734b9da1dfeb06e35ade5956b4 (patch) | |
| tree | fbf4ad9217a958b87c8a23139c7e601221ffe955 | |
| parent | 622c88ec99c537fec3bd66d913b82ce3462e8a3a (diff) | |
| download | kolla-b46d625b52980b734b9da1dfeb06e35ade5956b4.tar.gz kolla-b46d625b52980b734b9da1dfeb06e35ade5956b4.zip | |
add sahara log in heka
Closes-Bug: #1631286
Change-Id: I874913a08e932766d9517bf4740de94146d7b5fb
| -rw-r--r-- | ansible/roles/common/templates/cron-logrotate-sahara.conf.j2 | 3 | ||||
| -rw-r--r-- | ansible/roles/common/templates/cron.json.j2 | 1 | ||||
| -rw-r--r-- | ansible/roles/common/templates/heka-openstack.toml.j2 | 2 |
3 files changed, 5 insertions, 1 deletions
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 000000000..57a98d315 --- /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 85d0a1a4f..7e1f4ab17 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 a31605618..51a1535f4 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"] |