mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

logmngr: remote uci option file_path

Browse source 
* 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
This commit is contained in:
Rahul Thakur 2024-07-18 12:46:18 +05:30
parent 3e14637e3d
commit 10f3015d32
2 changed files with 24 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
logmngr/files/lib/logmngr/fluent-bit.sh
View file

@ -174,22 +174,16 @@ handle_log_file() {
return return
fi fi
local file_name local file
local file_path config_get file $section file
config_get file_name $section file_name if [ -z "$file" ]; then
if [ -z "$file_name" ]; then
return return
fi fi
echo "[OUTPUT]" >> ${TMP_CONF_FILE} echo "[OUTPUT]" >> ${TMP_CONF_FILE}
echo " name file" >> ${TMP_CONF_FILE} echo " name file" >> ${TMP_CONF_FILE}
echo " match $match" >> ${TMP_CONF_FILE} echo " match $match" >> ${TMP_CONF_FILE}
echo " file $file_name" >> ${TMP_CONF_FILE} echo " file $file" >> ${TMP_CONF_FILE}
config_get file_path $section file_path
if [ -n "$file_path" ]; then
echo " path $file_path" >> ${TMP_CONF_FILE}
fi
} }
handle_log_remote() { handle_log_remote() {

54
logmngr/files/lib/logmngr/syslog-ng.sh
View file

@ -65,42 +65,42 @@ generate_severity_regex() {
if [ "$sev_compare" == "0" ]; then if [ "$sev_compare" == "0" ]; then
case $sev_level in 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 esac
elif [ "$sev_compare" == "1" ]; then elif [ "$sev_compare" == "1" ]; then
# generate regex for all severity value greater than or equal to # generate regex for all severity value greater than or equal to
# sev_level # sev_level
case $sev_level in 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 esac
fi fi
@ -164,15 +164,6 @@ handle_filter_conf() {
echo "};" >> ${TMP_CONF_FILE} 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() { handle_filter_ref() {
local filter_name="$1" local filter_name="$1"
config_foreach handle_filter_conf filter "$filter_name" config_foreach handle_filter_conf filter "$filter_name"
@ -195,20 +186,15 @@ handle_log_file() {
return return
fi fi
local file_name local file
local file_path config_get file $section file
config_get file_name $section file_name if [ -z "$file" ]; then
if [ -z "$file_name" ]; then
return return
fi 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 "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} echo -e "};" >> ${TMP_CONF_FILE}
# now generate the log section for each action section to bring into effect # now generate the log section for each action section to bring into effect