From 7041a70eeb3e88750a63721d9219968010a68688 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 1 Apr 2021 15:30:38 +0200
Subject: [PATCH] elasticsearch: log rotation is more readable/maintainable

---
 CHANGELOG.md                                         | 2 ++
 elasticsearch/templates/rotate_elasticsearch_logs.j2 | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d60577d2..71e532e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ The **patch** part changes incrementally at each release.
 * apache: deny requests to ^/evolinux_fpm_status-.*
 * certbot: use a fixed 1.9.0 version of the certbot-auto script (renamed "letsencrypt-auto")
 * cerbot: use the legacy script on Debian 8 and 9
+* elasticsearch: log rotation is more readable/maintainable
 * evoacme: upstream release 21.01
 * evolinux-users: Add sudo rights for nagios for multi-php lxc
 * listupgrade: update script from upstream
@@ -145,6 +146,7 @@ The **patch** part changes incrementally at each release.
 * certbot: fix haproxy hook (ssl cert directory detection)
 * certbot: install certbot dependencies non-interactively for jessie
 * elasticsearch: configure cluster with seed hosts and initial masters
+* elasticsearch: log rotation is more readable/maintainable
 * elasticsearch: set tmpdir before datadir
 * evoacme: read values from environment before defaults file
 * evoacme: update for new certbot role
diff --git a/elasticsearch/templates/rotate_elasticsearch_logs.j2 b/elasticsearch/templates/rotate_elasticsearch_logs.j2
index 5ebd35bd..849a9ca1 100644
--- a/elasticsearch/templates/rotate_elasticsearch_logs.j2
+++ b/elasticsearch/templates/rotate_elasticsearch_logs.j2
@@ -5,5 +5,10 @@ LOG_DIR=/var/log/elasticsearch
 USER=elasticsearch
 MAX_AGE={{ elasticsearch_log_rotate_days | mandatory }}
 
-find ${LOG_DIR} -type f -user ${USER} \( -name "*.log.??" -o -name "*.log.????-??-??" -o -name "*-????-??-??.log" \) -not -name "*.gz" -exec gzip --best {} \;
-find ${LOG_DIR} -type f -user ${USER} \( -name "*.log.??.gz" -o -name "*.log.????-??-??.gz" -o -name "*-????-??-??.log.gz" \) -ctime +${MAX_AGE} -delete
+# Compress logs
+find ${LOG_DIR} -type f -user ${USER} -name "*.log.????-??-??" -exec gzip --best {} \;
+find ${LOG_DIR} -type f -user ${USER} -name "*-????-??-??.log" -exec gzip --best {} \;
+find ${LOG_DIR} -type f -user ${USER} -name "*.log.??" -not -name "*.gz" -exec gzip --best {} \;
+
+# Delete old logs
+find ${LOG_DIR} -type f -user ${USER} -name "*gz" -ctime +${MAX_AGE} -delete
\ No newline at end of file