NC | noobaa log is not performing logrotate

naveenpaul1 · romayalon · commit 920e7e1d0a8d · 2024-07-23T11:43:44.000+03:00
Signed-off-by: naveenpaul1 <napaul@redhat.com> (cherry picked from commit c26e52f)
diff --git a/docs/dev_guide/standalone_with_db.md b/docs/dev_guide/standalone_with_db.md
@@ -181,7 +181,7 @@ You can use the configuration for `rsyslog` and `logrotate` for RHEL8. The logs
 
 ```
 sudo cp src/deploy/standalone/noobaa_syslog.conf /etc/rsyslog.d/
-sudo cp src/deploy/standalone/logrotate_noobaa.conf /etc/logrotate.d/
+sudo cp src/deploy/standalone/noobaa-logrotate /etc/logrotate.d/
 sudo systemctl restart systemd-journald rsyslog
 ```
 
@@ -192,7 +192,7 @@ Additionally, it would be helpful if you configure to disable the rate limit of
 1. Add the 2 lines below into `/etc/systemd/journald.conf`
 
 ```
-RateLimitInterva]lSec=0s
+RateLimitIntervalSec=0s
 RateLimitBurst=0
 ```
 
diff --git a/docs/non_containerized_NSFS.md b/docs/non_containerized_NSFS.md
@@ -582,14 +582,14 @@ systemctl status rsyslog
 
 Noobaa logs are pushed to `var/log/noobaa.log` and the log is rotated and compressed daily.
 
-Verify the rsyslog and logrotate rpm configuration is complete by checking the files `etc/rsyslog.d/noobaa_syslog.conf` for rsyslog and `etc/logrotate.d/noobaa/logrotate_noobaa.conf` for logrotate.These files contain the noobaa specific configuration for rsyslog and logrotate.
+Verify the rsyslog and logrotate rpm configuration is complete by checking the files `etc/rsyslog.d/noobaa_syslog.conf` for rsyslog and `etc/logrotate.d/noobaa-logrotate` for logrotate.These files contain the noobaa specific configuration for rsyslog and logrotate.
 
-Logrotate configuration is set up under `/etc/logrotate.d/noobaa/`. In order to trigger rotation when log files reache size threshold, each log file (`/var/log/noobaa.log` and `/var/log/noobaa_events.log`) uses its own rsyslog `outchannel` that triggers logrotate once file size reaches a limit (105MB). Logrotate is also typically called from cron on daily schedule.
+Logrotate configuration is set up under `/etc/logrotate.d/`.  Logrotate is called from cron on daily schedule.
 
 To rotate the logs manually run.
 
 ```
-logrotate /etc/logrotate.d/noobaa/logrotate_noobaa.conf
+logrotate /etc/logrotate.d/noobaa-logrotate
 ```
 
 **Create env file under the configuration directory (OPTIONAL) -**
diff --git a/src/deploy/NVA_build/NooBaa.Dockerfile b/src/deploy/NVA_build/NooBaa.Dockerfile
@@ -110,7 +110,7 @@ COPY ./src/deploy/NVA_build/supervisord.orig /tmp/supervisord
 COPY ./src/deploy/NVA_build/supervisorctl.bash_completion /etc/bash_completion.d/supervisorctl
 COPY ./src/deploy/NVA_build/rsyslog.conf /etc/rsyslog.conf
 COPY ./src/deploy/NVA_build/noobaa_syslog.conf /etc/rsyslog.d/
-COPY ./src/deploy/NVA_build/logrotate_noobaa.conf /etc/logrotate.d/noobaa/
+COPY ./src/deploy/NVA_build/noobaa-logrotate /etc/logrotate.d/
 COPY ./src/deploy/NVA_build/noobaa_init.sh /noobaa_init_files/
 
 COPY ./src/deploy/NVA_build/setup_platform.sh /usr/bin/setup_platform.sh
diff --git a/src/deploy/NVA_build/logrotate.sh b/src/deploy/NVA_build/logrotate.sh
@@ -8,7 +8,7 @@ echo "*/5 * * * * /root/node_modules/noobaa-core/src/deploy/NVA_build/noobaa_log
 while true; do
 
     echo "$(date): =================================== running logrotate ===================================" >/dev/stdout 2>&1
-    /usr/sbin/logrotate -v /etc/logrotate.d/noobaa/logrotate_noobaa.conf >/dev/stdout 2>&1
+    /usr/sbin/logrotate -v /etc/logrotate.d/noobaa-logrotate >/dev/stdout 2>&1
     echo "$(date): =================================== logrotate Done ======================================" >/dev/stdout 2>&1
 
     sleep 60
diff --git a/src/deploy/NVA_build/noobaa-logrotate b/src/deploy/NVA_build/noobaa-logrotate
diff --git a/src/deploy/RPM_build/RPM.Dockerfile b/src/deploy/RPM_build/RPM.Dockerfile
@@ -5,7 +5,6 @@ ARG CENTOS_VER=9
 ARG BUILD_S3SELECT=0
 ARG BUILD_S3SELECT_PARQUET=0
 
-RUN mkdir -p /etc/logrotate.d/noobaa/
 RUN mkdir -p /etc/noobaa.conf.d/
 
 COPY ./src/agent ./src/agent
@@ -35,8 +34,7 @@ COPY ./package*.json ./
 COPY ./binding.gyp .
 COPY ./src/deploy/standalone/noobaa_rsyslog.conf ./src/deploy/standalone/noobaa_rsyslog.conf
 COPY ./src/deploy/standalone/noobaa_syslog.conf ./src/deploy/standalone/noobaa_syslog.conf
-COPY ./src/deploy/standalone/logrotate_noobaa.conf ./src/deploy/standalone/logrotate_noobaa.conf
-COPY ./src/deploy/standalone/logrotate_noobaa.sh ./src/deploy/standalone/logrotate_noobaa.sh
+COPY ./src/deploy/standalone/noobaa-logrotate ./src/deploy/standalone/noobaa-logrotate
 COPY ./src/manage_nsfs ./src/manage_nsfs
 
 WORKDIR /build
diff --git a/src/deploy/RPM_build/noobaa.spec b/src/deploy/RPM_build/noobaa.spec
@@ -87,15 +87,14 @@ mkdir -p $RPM_BUILD_ROOT/etc/noobaa.conf.d/
 mkdir -p $RPM_BUILD_ROOT/etc/rsyslog.d/
 mv $RPM_BUILD_ROOT/usr/local/noobaa-core/src/deploy/standalone/noobaa_syslog.conf $RPM_BUILD_ROOT/etc/rsyslog.d/noobaa_syslog.conf
 
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/noobaa
-ln -s /usr/local/noobaa-core/src/deploy/standalone/logrotate_noobaa.conf $RPM_BUILD_ROOT/etc/logrotate.d/noobaa/logrotate_noobaa.conf
-chmod +x $RPM_BUILD_ROOT/usr/local/noobaa-core/src/deploy/standalone/logrotate_noobaa.sh
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+mv $RPM_BUILD_ROOT/usr/local/noobaa-core/src/deploy/standalone/noobaa-logrotate $RPM_BUILD_ROOT/etc/logrotate.d/noobaa-logrotate
 
 %files
 /usr/local/noobaa-core
 %{_unitdir}/noobaa.service
-/etc/logrotate.d/noobaa/logrotate_noobaa.conf
-/etc/rsyslog.d/noobaa_syslog.conf
+%config(noreplace) /etc/logrotate.d/noobaa-logrotate
+%config(noreplace) /etc/rsyslog.d/noobaa_syslog.conf
 /etc/noobaa.conf.d/
 /usr/local/bin/noobaa-cli
 %doc
diff --git a/src/deploy/spectrum_archive/deployment_guide.md b/src/deploy/spectrum_archive/deployment_guide.md
@@ -157,12 +157,12 @@ systemctl status rsyslog
 
 Noobaa logs are pushed to `/var/log/noobaa.log` and the log is rotated and compressed daily.
 
-Verify the rsyslog and logrotate rpm configuration is complete by checking the files `/etc/rsyslog.d/noobaa_syslog.conf` and `/etc/rsyslog.d/noobaa_rsyslog.conf` for rsyslog and `/etc/logrotate.d/noobaa/logrotate_noobaa.conf` for logrotate.These files contain the noobaa specific configuration for rsyslog and logrotate.
+Verify the rsyslog and logrotate rpm configuration is complete by checking the files `/etc/rsyslog.d/noobaa_syslog.conf` and `/etc/rsyslog.d/noobaa_rsyslog.conf` for rsyslog and `/etc/logrotate.d/noobaa-logrotate` for logrotate.These files contain the noobaa specific configuration for rsyslog and logrotate.
 
 Rotate the logs manually.
 
 ```
-logrotate /etc/logrotate.d/noobaa/logrotate_noobaa.conf
+logrotate /etc/logrotate.d/noobaa-logrotate
 ```
 
 # FAQ
diff --git a/src/deploy/standalone/logrotate_noobaa.sh b/src/deploy/standalone/logrotate_noobaa.sh
diff --git a/src/deploy/standalone/noobaa-logrotate b/src/deploy/standalone/noobaa-logrotate
@@ -12,6 +12,7 @@
     postrotate 
         killall -HUP rsyslogd || true
         killall -HUP syslogd || true
+        systemctl reload syslog-ng > /dev/null 2>&1 || true
     endscript
 }
 
@@ -29,6 +30,7 @@
     postrotate
         killall -HUP rsyslogd || true
         killall -HUP syslogd || true
+        systemctl reload syslog-ng > /dev/null 2>&1 || true
     endscript
 }
 
@@ -44,5 +46,6 @@
     postrotate
         killall -HUP rsyslogd || true
         killall -HUP syslogd || true
+        systemctl reload syslog-ng > /dev/null 2>&1 || true
     endscript
 }
diff --git a/src/deploy/standalone/noobaa_syslog.conf b/src/deploy/standalone/noobaa_syslog.conf
@@ -4,6 +4,9 @@ $umask 0000
 $FileCreateMode 0644
 $EscapeControlCharactersOnReceive off
 
+$imjournalRatelimitInterval 0
+$imjournalRatelimitBurst 0
+
 # Provides UDP/TCP forwarding. The IP/DNS is the server's IP/DNS address
 # This is an example of sending everything except NooBaa logs using UDP
 # When changing this format make sure to change the relevant functions in os_utils
@@ -28,14 +31,12 @@ template(name="LogseneFormat" type="list" option.json="on") {
   constant(value="\"}\n")
 }
 
-# 105M limit(110100480), 5MB bigger than logrotate value. When updating this value update logrotate also.
-$outchannel log_rotation,/var/log/noobaa.log,110100480,/usr/local/noobaa-core/src/deploy/standalone/logrotate_noobaa.sh
-local0.* :omfile:$log_rotation
+# For servers
+local0.*        /var/log/noobaa.log;RSYSLOG_FileFormat
 &stop
 
 # For events
-$outchannel event_rotation,/var/log/noobaa_events.log,110100480,/usr/local/noobaa-core/src/deploy/standalone/logrotate_noobaa.sh
-local2.* :omfile:$event_rotation;LogseneFormat
+local2.*        /var/log/noobaa_events.log;LogseneFormat
 &stop
 
 # For clients
diff --git a/src/test/unit_tests/test_debug_module.js b/src/test/unit_tests/test_debug_module.js
@@ -90,7 +90,7 @@ mocha.describe('debug_module', function() {
         if (os_utils.IS_MAC) {
             rotation_command = 'ls';
         } else {
-            rotation_command = '/usr/sbin/logrotate /etc/logrotate.d/noobaa';
+            rotation_command = '/usr/sbin/logrotate /etc/logrotate.d';
         }
         return os_utils.exec(rotation_command).then(function() {
             const dbg = new DebugModule('/web/noise/noobaa-core/src/blabla.asd/lll.asd');

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`postrotate`
`13`	`13`	`killall -HUP rsyslogd \|\| true`
`14`	`14`	`killall -HUP syslogd \|\| true`
	`15`	`+ systemctl reload syslog-ng > /dev/null 2>&1 \|\| true`
`15`	`16`	`endscript`
`16`	`17`	`}`
`17`	`18`
`@@ -29,6 +30,7 @@`
`29`	`30`	`postrotate`
`30`	`31`	`killall -HUP rsyslogd \|\| true`
`31`	`32`	`killall -HUP syslogd \|\| true`
	`33`	`+ systemctl reload syslog-ng > /dev/null 2>&1 \|\| true`
`32`	`34`	`endscript`
`33`	`35`	`}`
`34`	`36`
`@@ -44,5 +46,6 @@`
`44`	`46`	`postrotate`
`45`	`47`	`killall -HUP rsyslogd \|\| true`
`46`	`48`	`killall -HUP syslogd \|\| true`
	`49`	`+ systemctl reload syslog-ng > /dev/null 2>&1 \|\| true`
`47`	`50`	`endscript`
`48`	`51`	`}`