From 2dfdeb94d6482ef00b49bc1653ef6393558b45cc Mon Sep 17 00:00:00 2001
From: Zain Budhwani <99770260+zbud-msft@users.noreply.github.com>
Date: Wed, 20 Sep 2023 16:27:42 -0700
Subject: [PATCH] Load generic omprog in all dockers for rsyslog plugin support
 (#16601)

### Why I did it

##### Work item tracking
- Microsoft ADO **(number only)**:13366345

#### How I did it

Add generic omprog file in all dockers for rsyslog plugin support. Add file to docker-config-engine-bullseye so no need to add individually.

#### How to verify it

UT/Pipeline
---
 .../00-load-omprog.conf}                                         | 0
 dockers/docker-config-engine-bullseye/Dockerfile.j2              | 1 +
 dockers/docker-fpm-frr/Dockerfile.j2                             | 1 -
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename dockers/{docker-fpm-frr/00-frr.conf => docker-config-engine-bullseye/00-load-omprog.conf} (100%)

diff --git a/dockers/docker-fpm-frr/00-frr.conf b/dockers/docker-config-engine-bullseye/00-load-omprog.conf
similarity index 100%
rename from dockers/docker-fpm-frr/00-frr.conf
rename to dockers/docker-config-engine-bullseye/00-load-omprog.conf
diff --git a/dockers/docker-config-engine-bullseye/Dockerfile.j2 b/dockers/docker-config-engine-bullseye/Dockerfile.j2
index 700af660a9..4d0345c4b5 100644
--- a/dockers/docker-config-engine-bullseye/Dockerfile.j2
+++ b/dockers/docker-config-engine-bullseye/Dockerfile.j2
@@ -50,6 +50,7 @@ RUN pip3 install redis==4.5.4
 COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"]
 COPY ["files/readiness_probe.sh", "/usr/bin/"]
 COPY ["files/container_startup.py", "/usr/share/sonic/scripts/"]
+COPY ["00-load-omprog.conf", "/etc/rsyslog.d/"]
 
 ## Clean up
 RUN apt-get purge -y               \
diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
index 5a14558c3c..d15fc18462 100644
--- a/dockers/docker-fpm-frr/Dockerfile.j2
+++ b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -54,7 +54,6 @@ COPY ["TSC", "/usr/bin/TSC"]
 COPY ["TS", "/usr/bin/TS"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["zsocket.sh", "/usr/bin/"]
-COPY ["00-frr.conf", "/etc/rsyslog.d/"]
 COPY ["*.json", "/etc/rsyslog.d/"]
 COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"]
 RUN chmod a+x /usr/bin/TSA && \