From 538af7e3bf5a421825815a043fee991d44ca75fa Mon Sep 17 00:00:00 2001
From: Sandhya Kalisetty <sandhya.kalisetty@windriver.com>
Date: Fri, 24 Jan 2025 12:07:30 -0500
Subject: [PATCH] Modifying syslog-ng.conf to account for sm.conf

Introduced a new file sm.conf as part of Story: 2010533
Hence moving SM related syslog configuration to the new file.

Depends-On:https://review.opendev.org/c/starlingx/ha/+/940153

Test Plan:

AIO-Duplex : Verified that the changes are available during the initial host installation with the ISO.
AIO-Duplex:  Verified that the changes are seen during an upgrade.
AIO-Duplex: Verified the changes are available during a swact and subsequent host lock and unlock

Closes-Bug: 2083632
Change-Id: I3dda49d041514b86b3841feb8ffc2089d96100a2
Signed-off-by: Sandhya Kalisetty sandhya.kalisetty@windriver.com
---
 syslog-ng-config/debian-source/syslog-ng.conf | 4 +---
 syslog-ng-config/files/syslog-ng.conf         | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/syslog-ng-config/debian-source/syslog-ng.conf b/syslog-ng-config/debian-source/syslog-ng.conf
index 6409a36..bc7825b 100644
--- a/syslog-ng-config/debian-source/syslog-ng.conf
+++ b/syslog-ng-config/debian-source/syslog-ng.conf
@@ -119,7 +119,6 @@ destination d_uucp      { file("/var/log/uucp.log"); };
 destination d_postgres  { file("/var/log/postgres.log"); };
 destination d_platform  { file("/var/log/platform.log"); };
 destination d_openstack { file("/var/log/openstack.log" template(t_openstack)); };
-destination d_sm        { file("/var/log/sm.log"); };
 
 # HAProxy Log destination
 destination d_haproxy { file("/var/log/haproxy.log"); };
@@ -271,7 +270,7 @@ filter f_local2 { facility(local2)
                   and not program(fm)
                   and not filter(f_keystoneall)
                   and not filter(f_keystoneapi) };
-filter f_local3 { facility(local3); };
+# Facility code local3 is assigned to Service Management
 filter f_local5 { facility(local5); };
 filter f_local6 { facility(local6); };
 filter f_local7 { facility(local7); };
@@ -334,7 +333,6 @@ log { source(s_src); filter(f_uucp);   destination(d_uucp); };
 log { source(s_src); filter(f_local0); destination(d_postgres); };
 log { source(s_src); filter(f_local1); destination(d_platform); };
 log { source(s_src); filter(f_local2); destination(d_openstack); };
-log { source(s_src); filter(f_local3); destination(d_sm); };
 
 # HAProxy Log Path
 log { source(s_udp); filter(f_local1); destination(d_haproxy); };
diff --git a/syslog-ng-config/files/syslog-ng.conf b/syslog-ng-config/files/syslog-ng.conf
index 56b1662..d4e2f48 100644
--- a/syslog-ng-config/files/syslog-ng.conf
+++ b/syslog-ng-config/files/syslog-ng.conf
@@ -104,7 +104,6 @@ destination d_uucp      { file("/var/log/uucp.log"); };
 destination d_postgres  { file("/var/log/postgres.log"); };
 destination d_platform  { file("/var/log/platform.log"); };
 destination d_openstack { file("/var/log/openstack.log" template(t_openstack)); };
-destination d_sm        { file("/var/log/sm.log"); };
 
 # HAProxy Log destination
 destination d_haproxy { file("/var/log/haproxy.log"); };
@@ -253,7 +252,7 @@ filter f_local2 { facility(local2)
                   and not program(fm)
                   and not filter(f_keystoneall)
                   and not filter(f_keystoneapi) };
-filter f_local3 { facility(local3); };
+# Facility code local3 is assigned to Service Management
 filter f_local5 { facility(local5); };
 filter f_local6 { facility(local6); };
 filter f_local7 { facility(local7); };
@@ -308,7 +307,6 @@ log { source(s_src); filter(f_uucp);   destination(d_uucp); };
 log { source(s_src); filter(f_local0); destination(d_postgres); };
 log { source(s_src); filter(f_local1); destination(d_platform); };
 log { source(s_src); filter(f_local2); destination(d_openstack); };
-log { source(s_src); filter(f_local3); destination(d_sm); };
 
 # HAProxy Log Path
 log { source(s_udp); filter(f_local1); destination(d_haproxy); };