From 10f3015d32c12b6da21dff228e664e3097c58808 Mon Sep 17 00:00:00 2001
From: Rahul Thakur <rahul.thakur@iopsys.eu>
Date: Thu, 18 Jul 2024 12:46:18 +0530
Subject: [PATCH] logmngr: remote uci option file_path

* this is a bit of an overkill and not needed. Instead, we can use
option file to have full path to file including file name.

example: /var/log/messages

* other formatting errors and remove unused function in syslog-ng
---
 logmngr/files/lib/logmngr/fluent-bit.sh | 14 ++-----
 logmngr/files/lib/logmngr/syslog-ng.sh  | 54 +++++++++----------------
 2 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/logmngr/files/lib/logmngr/fluent-bit.sh b/logmngr/files/lib/logmngr/fluent-bit.sh
index 2bf7902c3..756ddbcef 100644
--- a/logmngr/files/lib/logmngr/fluent-bit.sh
+++ b/logmngr/files/lib/logmngr/fluent-bit.sh
@@ -174,22 +174,16 @@ handle_log_file() {
 		return
 	fi
 
-	local file_name
-	local file_path
-	config_get file_name $section file_name
-	if [ -z "$file_name" ]; then
+	local file
+	config_get file $section file
+	if [ -z "$file" ]; then
 		return
 	fi
 
 	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
 	echo "    name         file" >> ${TMP_CONF_FILE}
 	echo "    match        $match" >> ${TMP_CONF_FILE}
-	echo "    file        $file_name" >> ${TMP_CONF_FILE}
-
-	config_get file_path $section file_path
-	if [ -n "$file_path" ]; then
-		echo "    path        $file_path" >> ${TMP_CONF_FILE}
-	fi
+	echo "    file        $file" >> ${TMP_CONF_FILE}
 }
 
 handle_log_remote() {
diff --git a/logmngr/files/lib/logmngr/syslog-ng.sh b/logmngr/files/lib/logmngr/syslog-ng.sh
index 4b7516dea..077191fed 100644
--- a/logmngr/files/lib/logmngr/syslog-ng.sh
+++ b/logmngr/files/lib/logmngr/syslog-ng.sh
@@ -65,42 +65,42 @@ generate_severity_regex() {
 
 	if [ "$sev_compare" == "0" ]; then
 		case $sev_level in
-		"0") echo -e "\t level(emerg)" >> ${TMP_CONF_FILE}
+		"0") echo -e "\tlevel(emerg)" >> ${TMP_CONF_FILE}
 		;;
-		"1") echo -e "\t level(alert)" >> ${TMP_CONF_FILE}
+		"1") echo -e "\tlevel(alert)" >> ${TMP_CONF_FILE}
 		;;
-		"2") echo -e "\t level(crit)" >> ${TMP_CONF_FILE}
+		"2") echo -e "\tlevel(crit)" >> ${TMP_CONF_FILE}
 		;;
-		"3") echo -e "\t level(err)" >> ${TMP_CONF_FILE}
+		"3") echo -e "\tlevel(err)" >> ${TMP_CONF_FILE}
 		;;
-		"4") echo -e "\t level(warning)" >> ${TMP_CONF_FILE}
+		"4") echo -e "\tlevel(warning)" >> ${TMP_CONF_FILE}
 		;;
-		"5") echo -e "\t level(notice)" >> ${TMP_CONF_FILE}
+		"5") echo -e "\tlevel(notice)" >> ${TMP_CONF_FILE}
 		;;
-		"6") echo -e "\t level(info)" >> ${TMP_CONF_FILE}
+		"6") echo -e "\tlevel(info)" >> ${TMP_CONF_FILE}
 		;;
-		"7") echo -e "\t level(debug)" >> ${TMP_CONF_FILE}
+		"7") echo -e "\tlevel(debug)" >> ${TMP_CONF_FILE}
 		;;
 		esac
 	elif [ "$sev_compare" == "1" ]; then
 		# generate regex for all severity value greater than or equal to
 		# sev_level
 		case $sev_level in
-		"0") echo -e "\t level(emerg)" >> ${TMP_CONF_FILE}
+		"0") echo -e "\tlevel(emerg)" >> ${TMP_CONF_FILE}
 		;;
-		"1") echo -e "\t level(alert..emerg)" >> ${TMP_CONF_FILE}
+		"1") echo -e "\tlevel(alert..emerg)" >> ${TMP_CONF_FILE}
 		;;
-		"2") echo -e "\t level(crit..emerg)" >> ${TMP_CONF_FILE}
+		"2") echo -e "\tlevel(crit..emerg)" >> ${TMP_CONF_FILE}
 		;;
-		"3") echo -e "\t level(err..emerg)" >> ${TMP_CONF_FILE}
+		"3") echo -e "\tlevel(err..emerg)" >> ${TMP_CONF_FILE}
 		;;
-		"4") echo -e "\t level(warning..emerg)" >> ${TMP_CONF_FILE}
+		"4") echo -e "\tlevel(warning..emerg)" >> ${TMP_CONF_FILE}
 		;;
-		"5") echo -e "\t level(notice..emerg)" >> ${TMP_CONF_FILE}
+		"5") echo -e "\tlevel(notice..emerg)" >> ${TMP_CONF_FILE}
 		;;
-		"6") echo -e "\t level(info..emerg)" >> ${TMP_CONF_FILE}
+		"6") echo -e "\tlevel(info..emerg)" >> ${TMP_CONF_FILE}
 		;;
-		"7") echo -e "\t level(debug..emerg)" >> ${TMP_CONF_FILE}
+		"7") echo -e "\tlevel(debug..emerg)" >> ${TMP_CONF_FILE}
 		;;
 		esac
 	fi
@@ -164,15 +164,6 @@ handle_filter_conf() {
 	echo "};" >> ${TMP_CONF_FILE}
 }
 
-create_filter_section() {
-	local match="$1"
-
-	echo "[FILTER]" >> ${TMP_CONF_FILE}
-	echo "    name        grep" >> ${TMP_CONF_FILE}
-	echo "    match       $match" >> ${TMP_CONF_FILE}
-	echo "    logical_op  or" >> ${TMP_CONF_FILE} # handle multiple filters
-}
-
 handle_filter_ref() {
 	local filter_name="$1"
 	config_foreach handle_filter_conf filter "$filter_name"
@@ -195,20 +186,15 @@ handle_log_file() {
 		return
 	fi
 
-	local file_name
-	local file_path
-	config_get file_name $section file_name
-	if [ -z "$file_name" ]; then
+	local file
+	config_get file $section file
+	if [ -z "$file" ]; then
 		return
 	fi
 
 
-	config_get file_path $section file_path
-	if [ -n "$file_path" ]; then
-		file_name=$file_path/$file_name
-	fi
 	echo -e "destination file_$match {" >> ${TMP_CONF_FILE}
-	echo -e "\t file("$file_name");" >> ${TMP_CONF_FILE}
+	echo -e "\tfile("$file");" >> ${TMP_CONF_FILE}
 	echo -e "};" >> ${TMP_CONF_FILE}
 
 	# now generate the log section for each action section to bring into effect