Skip to content

CA-407370: Use remote.conf for customer rsyslog forwarding rules #6328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robhoes merged 1 commit into from
Mar 6, 2025
Merged

CA-407370: Use remote.conf for customer rsyslog forwarding rules #6328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
CA-407370: Use remote.conf for customer rsyslog forwarding rules 
Signed-off-by: Gerald Elder-Vass <[email protected]>
  • Loading branch information
@GeraldEV
GeraldEV committed Mar 6, 2025
commit 468eb75dddfea6db512a8bfb4860ff2042efab66
28 changes: 4 additions & 24 deletions scripts/xe-syslog-reconfigure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,12 @@ do
shift
done

if [ -r /etc/syslog.conf ]; then
conf_file=/etc/syslog.conf
service=syslog
fi

if [ -r /etc/rsyslog.conf ]; then
conf_file=/etc/rsyslog.conf
service=rsyslog
fi

if [ -r /etc/rsyslog.d/xenserver.conf ]; then
conf_file=/etc/rsyslog.d/xenserver.conf
service=rsyslog
fi

if [ -z "$service" ]; then
echo "Error: unable to determine syslog service" >&2
exit 1
fi

sed -e '/^\*\.\*.*[@~]/ d' $conf_file >/etc/syslog.$$
if [ $remote -eq 1 ]; then
echo -e "*.* @$host\n*.* ~" >>/etc/syslog.$$
echo "# /etc/rsyslog.d/remote.conf is auto-generated by xe-syslog-reconfigure" > /etc/rsyslog.d/remote.conf
echo "*.* @$host" >> /etc/rsyslog.d/remote.conf
else
echo "*.* ~" >>/etc/syslog.$$
rm -f /etc/rsyslog.d/remote.conf
fi

[ -s /etc/syslog.$$ ] && mv -f /etc/syslog.$$ $conf_file
systemctl restart $service
systemctl restart rsyslog
Loading