From 9d62bf52a4e3b3d095a6a8231cd0508d80a301ad Mon Sep 17 00:00:00 2001
From: Keigo Noha <knoha@redhat.com>
Date: Mon, 8 Jul 2019 14:34:47 +0900
Subject: [PATCH] Add dateext and related parameters for logrotate

logrotate.pp should support dateext and related parameters.
By this change, a filename of a rotated file can be easily distinguished
by rotated date.

Change-Id: I798304a472df41b86a88611c97c2c99131faa0ad
(cherry picked from commit 1eafeb67bf6d613d891fc26ee4452cded8115741)
(cherry picked from commit 964fe8cc62192e180a93f215e8bf038cf7ba0ad8)
---
 manifests/profile/base/logging/logrotate.pp       | 15 +++++++++++++++
 ...t-and-related-parameters-58dd288c74b818f7.yaml |  5 +++++
 templates/logrotate/containers_logrotate.conf.erb |  9 +++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 releasenotes/notes/add-dateext-and-related-parameters-58dd288c74b818f7.yaml

diff --git a/manifests/profile/base/logging/logrotate.pp b/manifests/profile/base/logging/logrotate.pp
index d1b6ac560..f66dda66e 100644
--- a/manifests/profile/base/logging/logrotate.pp
+++ b/manifests/profile/base/logging/logrotate.pp
@@ -79,6 +79,18 @@
 #    Configures forced purge period for rotated logs.
 #    Overrides the rotation and rotate settings.
 #
+#  [*dateext*]
+#    (optional) Defaults to undef.
+#    Configures the dateext parameter.
+#
+#  [*dateformat*]
+#    (optional) Defaults to undef.
+#    Configures the dateformat parameter used with dateext parameter.
+#
+#  [*dateyesterday*]
+#    (optional) Defaults to undef.
+#    Configures the dateyesterday parameter used with dateext parameter.
+#
 # DEPRECATED PARAMETERS
 #
 #  [*size*]
@@ -102,6 +114,9 @@ class tripleo::profile::base::logging::logrotate (
   $maxsize          = '10M',
   $rotate           = 14,
   $purge_after_days = 14,
+  $dateext          = undef,
+  $dateformat       = undef,
+  $dateyesterday    = undef,
   # DEPRECATED PARAMETERS
   $size             = undef,
 ) {
diff --git a/releasenotes/notes/add-dateext-and-related-parameters-58dd288c74b818f7.yaml b/releasenotes/notes/add-dateext-and-related-parameters-58dd288c74b818f7.yaml
new file mode 100644
index 000000000..1cca10c1b
--- /dev/null
+++ b/releasenotes/notes/add-dateext-and-related-parameters-58dd288c74b818f7.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    Add dateext and related paramters for containerized logrotate service to
+    find easily when logfiles were rotated.
diff --git a/templates/logrotate/containers_logrotate.conf.erb b/templates/logrotate/containers_logrotate.conf.erb
index 53b48f380..a80ce6efa 100644
--- a/templates/logrotate/containers_logrotate.conf.erb
+++ b/templates/logrotate/containers_logrotate.conf.erb
@@ -19,4 +19,13 @@
 <%- if @compress %>
   compress
 <%- end %>
+<%- if @dateext %>
+  dateext
+<%- if @dateformat %>
+  dateformat <%= @dateformat %>
+<%- end %>
+<%- if @dateyesterday %>
+  dateyesterday
+<%- end %>
+<%- end %>
 }