From afc87b8ccd808f931f0ce43e1fc6a1fa96bbf107 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Wed, 6 Jan 2021 18:47:36 -0800
Subject: [PATCH] Updated imfile configuration for supervisord logs  (#6368)

Updated imfile configuration for supervisord logs for stretch and buster.
---
 .../etc/rsyslog.d/supervisor.conf              | 18 +++++++++---------
 .../etc/rsyslog.d/supervisor.conf              | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dockers/docker-base-buster/etc/rsyslog.d/supervisor.conf b/dockers/docker-base-buster/etc/rsyslog.d/supervisor.conf
index 7c7a64d7afe0..fde8d8a6c994 100644
--- a/dockers/docker-base-buster/etc/rsyslog.d/supervisor.conf
+++ b/dockers/docker-base-buster/etc/rsyslog.d/supervisor.conf
@@ -1,9 +1,9 @@
-$ModLoad imfile
-
-$InputFileName /var/log/supervisor/supervisord.log
-$InputFileTag supervisord
-$InputFileStateFile state-supervisor
-$InputFileSeverity info
-$InputFileFacility local0
-$InputFilePersistStateInterval 1
-$InputRunFileMonitor
+module(load="imfile" mode="inotify") # Ensure "inotify" mode is used
+$WorkDirectory /var/log/supervisor
+# Start Monitoring the file
+input(type="imfile"
+      File="/var/log/supervisor/supervisord.log"
+      Tag="supervisord"
+      Severity="info"
+      Facility="local0"
+      PersistStateInterval="1")
diff --git a/dockers/docker-base-stretch/etc/rsyslog.d/supervisor.conf b/dockers/docker-base-stretch/etc/rsyslog.d/supervisor.conf
index 7c7a64d7afe0..fde8d8a6c994 100644
--- a/dockers/docker-base-stretch/etc/rsyslog.d/supervisor.conf
+++ b/dockers/docker-base-stretch/etc/rsyslog.d/supervisor.conf
@@ -1,9 +1,9 @@
-$ModLoad imfile
-
-$InputFileName /var/log/supervisor/supervisord.log
-$InputFileTag supervisord
-$InputFileStateFile state-supervisor
-$InputFileSeverity info
-$InputFileFacility local0
-$InputFilePersistStateInterval 1
-$InputRunFileMonitor
+module(load="imfile" mode="inotify") # Ensure "inotify" mode is used
+$WorkDirectory /var/log/supervisor
+# Start Monitoring the file
+input(type="imfile"
+      File="/var/log/supervisor/supervisord.log"
+      Tag="supervisord"
+      Severity="info"
+      Facility="local0"
+      PersistStateInterval="1")