diff options
| author | Bartosz Bezak <bartosz@stackhpc.com> | 2020-07-13 08:37:25 +0000 |
|---|---|---|
| committer | Bartosz Bezak <bartosz@stackhpc.com> | 2020-07-14 09:47:33 +0200 |
| commit | 102ae176bfaebf10c041bb5fbaa8fa62215a5801 (patch) | |
| tree | 68f74e4290146d3956c8b4ea28401dc030f77e14 | |
| parent | ce337806a39a5114d7f84effd0330775a7b0545b (diff) | |
| download | kolla-102ae176bfaebf10c041bb5fbaa8fa62215a5801.tar.gz kolla-102ae176bfaebf10c041bb5fbaa8fa62215a5801.zip | |
Fix Logstash 6 log rotation - Stable/Train
Logstash 6 introduced in Centos 8 in Train release comes with log4j2
configuration that does not remove old compressed logs after rotation
Log rotation config backported from Logstash 7 - Combination of Size
Based and Time Based policies. Deletion occurs after 30 days or
3000 MB log files size - whichever comes first.
Change-Id: Ib44f493aad0813a8aba916c7c353b60cab954b5f
(cherry picked from commit 15f2af1b0217da0a0281268442202f22915570a1)
Closes-Bug: #1886975
| -rw-r--r-- | docker/logstash6/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1886975-454ac12be3d8e1d3.yaml | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/docker/logstash6/Dockerfile.j2 b/docker/logstash6/Dockerfile.j2 index 7368f58b2..e72160fce 100644 --- a/docker/logstash6/Dockerfile.j2 +++ b/docker/logstash6/Dockerfile.j2 @@ -19,6 +19,15 @@ ENV JAVA_HOME /usr/lib/jvm/jre-11-openjdk/ COPY elasticsearch.repo /etc/yum.repos.d/ {{ macros.install_packages(logstash_packages | customizable("packages")) }} + +# NOTE(bbezak): log-rotation/deletion config backported from logstash 7 +# https://github.com/elastic/logstash/commit/1ea1d1982d4174868f8de6c09be2e695b3e6597c +RUN sed -i /etc/logstash/log4j2.properties \ +-e '/appender.rolling.policies.size.size/a appender.rolling.strategy.type = DefaultRolloverStrategy\nappender.rolling.strategy.max = 30' \ +-e '/appender.json_rolling.policies.size.size/a appender.json_rolling.strategy.type = DefaultRolloverStrategy\nappender.json_rolling.strategy.max = 30' \ +-e '/appender.rolling_slowlog.policies.size.size/a appender.rolling_slowlog.strategy.type = DefaultRolloverStrategy\nappender.rolling_slowlog.strategy.max = 30' \ +-e '/appender.json_rolling_slowlog.policies.size.size/a appender.json_rolling_slowlog.strategy.type = DefaultRolloverStrategy\nappender.json_rolling_slowlog.strategy.max = 30' + COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start diff --git a/releasenotes/notes/bug-1886975-454ac12be3d8e1d3.yaml b/releasenotes/notes/bug-1886975-454ac12be3d8e1d3.yaml new file mode 100644 index 000000000..8264f26ae --- /dev/null +++ b/releasenotes/notes/bug-1886975-454ac12be3d8e1d3.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + Logstash 6 introduced in Centos 8 in Train release comes with log4j2 + configuration that does not remove old compressed logs after rotation + https://github.com/elastic/logstash/issues/11883 + Log rotation config backported from Logstash 7 - Combination of Size + Based and Time Based policies. Deletion occurs after 30 days or + 3000 MB log files size - whichever comes first. |