From 02d17d1d7b403dc530ac9a2847738b8b8cac8030 Mon Sep 17 00:00:00 2001
From: Rich Braun <richb@instantlinux.net>
Date: Tue, 5 Sep 2023 09:07:03 -0700
Subject: [PATCH] Issue #79 replace lograte script in rsyslogd; adjust
 data-sync (#130)

---
 images/data-sync/helm/Chart.yaml  |  2 +-
 images/data-sync/helm/values.yaml |  2 ++
 images/rsyslogd/Dockerfile        |  2 ++
 images/rsyslogd/rsyslog-rotate    | 19 +++++++++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 images/rsyslogd/rsyslog-rotate

diff --git a/images/data-sync/helm/Chart.yaml b/images/data-sync/helm/Chart.yaml
index b6a65e28..3c3220e6 100644
--- a/images/data-sync/helm/Chart.yaml
+++ b/images/data-sync/helm/Chart.yaml
@@ -5,7 +5,7 @@ home: https://github.com/instantlinux/docker-tools
 sources:
 - https://github.com/instantlinux/docker-tools
 type: application
-version: 0.1.9
+version: 0.1.10
 appVersion: "2.53.3-4.14.1-r1"
 dependencies:
 - name: chartlib
diff --git a/images/data-sync/helm/values.yaml b/images/data-sync/helm/values.yaml
index 9ea175ca..c5b10ed9 100644
--- a/images/data-sync/helm/values.yaml
+++ b/images/data-sync/helm/values.yaml
@@ -123,8 +123,10 @@ configmap:
       ignore = Path data-sync/gitlab/logs/sshd/current
       ignore = Path data-sync/jira/home/analytics-logs
       ignore = Path data-sync/jira/home/log/atlassian-jira.log
+      ignore = Path data-sync/jira/home/log/atlassian-jira-ipd-monitoring.log
       ignore = Path data-sync/jira/home/log/atlassian-jira-outgoing-mail.log
       ignore = Path data-sync/jira/home/log/atlassian-jira-perf.log
+      ignore = Path data-sync/jira/home/log/automation-jira-performance.csv
       ignore = Path data-sync/jira/home/monitor/ConnectionPoolGraph.rrd4j
       ignore = Path data-sync/jira/home/monitor/DatabaseReadWritesGraph.rrd4j
       ignore = Path data-sync/jira/home/plugins/.osgi-plugins/felix/felix-cache
diff --git a/images/rsyslogd/Dockerfile b/images/rsyslogd/Dockerfile
index d1762769..31144ccd 100644
--- a/images/rsyslogd/Dockerfile
+++ b/images/rsyslogd/Dockerfile
@@ -16,6 +16,8 @@ RUN apk add --update gzip logrotate rsyslog=$RSYSLOG_VERSION \
 VOLUME /var/log /etc/logrotate.d /etc/rsyslog.d
 EXPOSE 514 514/udp
 COPY logrotate.conf /etc/logrotate.conf
+COPY rsyslog-rotate /etc/logrotate.d/rsyslog
+
 RUN chmod 644 /etc/logrotate.conf
 
 ADD entrypoint.sh /root/
diff --git a/images/rsyslogd/rsyslog-rotate b/images/rsyslogd/rsyslog-rotate
new file mode 100644
index 00000000..8ddcb4d5
--- /dev/null
+++ b/images/rsyslogd/rsyslog-rotate
@@ -0,0 +1,19 @@
+/var/log/messages
+/var/log/auth.log
+/var/log/cron.log
+/var/log/kern.log
+/var/log/mail.log
+{
+    compress
+    dateext
+    maxage 365
+    rotate 45
+    missingok
+    notifempty
+    size +4096k
+    create 640 root root
+    sharedscripts
+    postrotate
+        /usr/bin/killall -HUP rsyslogd
+    endscript
+}