openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix Logstash 2.4 log rotation" into stable/stein

Browse Source
This commit is contained in:
Zuul 2020-07-16 08:01:14 +00:00 committed by Gerrit Code Review
commit 84d9d78e5f
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/common/tasks/config.yml
View File

@ -291,6 +291,7 @@
- { name: "keystone", enabled: "{{ enable_keystone }}" } - { name: "keystone", enabled: "{{ enable_keystone }}" }
- { name: "kibana", enabled: "{{ enable_kibana }}" } - { name: "kibana", enabled: "{{ enable_kibana }}" }
- { name: "kuryr", enabled: "{{ enable_kuryr }}" } - { name: "kuryr", enabled: "{{ enable_kuryr }}" }
- { name: "logstash", enabled: "{{ enable_monasca }}" }
- { name: "magnum", enabled: "{{ enable_magnum }}" } - { name: "magnum", enabled: "{{ enable_magnum }}" }
- { name: "manila", enabled: "{{ enable_manila }}" } - { name: "manila", enabled: "{{ enable_manila }}" }
- { name: "mariadb", enabled: "{{ enable_mariadb }}" } - { name: "mariadb", enabled: "{{ enable_mariadb }}" }

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

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

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

@ -31,6 +31,7 @@
( 'keystone', enable_keystone ), ( 'keystone', enable_keystone ),
( 'kibana', enable_kibana ), ( 'kibana', enable_kibana ),
( 'kuryr', enable_kuryr ), ( 'kuryr', enable_kuryr ),
( 'logstash', enable_monasca ),
( 'magnum', enable_magnum ), ( 'magnum', enable_magnum ),
( 'manila', enable_manila ), ( 'manila', enable_manila ),
( 'mariadb', enable_mariadb ), ( 'mariadb', enable_mariadb ),

9
releasenotes/notes/bug-1886787-013164ffc2f67264.yaml Normal file
View File

@ -0,0 +1,9 @@
---
fixes:
- |
This patch adds ``kolla-ansible`` internal logrotate config for
Logstash. Logstash 2.4 uses integrated in container logrotate
configuration which tries to rotate logs in /var/log/logstash
while ``kolla-ansible`` deployed Logstash logs are in
/var/log/kolla/logstash.
`LP#1886787 <https://launchpad.net/bugs/1886787>`__