Skip to content

Rebase on xenserver-release-8.4.0-18.xs8.src.rpm #51

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Rebase on xenserver-release-8.4.0-18.xs8.src.rpm #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a3a6eb
Sync with xenserver-release-v8.4.0-17.tar.gz
Mar 5, 2025
b437967
Adapt /etc/rsyslog.d/xenserver.conf header for XCP-ng
stormi Sep 22, 2025
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
16 changes: 12 additions & 4 deletions src/common/etc/rsyslog.d/xenserver.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# -- DO NOT EDIT THIS FILE --
# xenserver.conf contains the XenServer/XCP-ng specific logging configurations
#
# Remote forwarding must be configured via Xen Orchestra, which will ask XAPI to
# generate file /etc/rsyslog.d/remote.conf (do not edit that file either).
#
# Any other rsyslog configuration change must be avoided.
# However, if there are no other options, they must be evaluated with technical support
# representatives, and written to a file named /etc/rsyslog.d/custom.conf.
# Note that there are no guarantees regarding the order in which rules from different
Copy link
Contributor

@rzr rzr Nov 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure ? see
xcp-ng-rpms/xcp-ng-release#33 (comment)

I would make rules from custom.conf parsed after remote.conf and before xenserver.conf.

This can be easly achieved by just renaming custom.conf to user-*.conf files

Copy link
Member Author

@stormi stormi Nov 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I read https://www.rsyslog.com/doc/configuration/global/options/rsconf1_includeconfig.html and it's not clear to me whether the rule they describe applies when you specify a directory, rather than directory/*.conf.

Copy link
Member Author

@stormi stormi Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see no point in having the custom rules parsed between remote.conf and xenserver.conf. To me, either we want them parsed before (and then our defaults to still get applied on top), or at the very end (zz-custom.conf).

# files are applied.

# Suppress duplicate messages and report "Last line repeated n times"
$RepeatedMsgReduction on

Expand Down Expand Up @@ -86,7 +98,3 @@ local1.* :omfile:$vmss_log
# xcp-rrdd-plugins (info and above) to local0
$outchannel xcp_rrdd_log,/var/log/xcp-rrdd-plugins.log,104857600,/etc/cron.daily/logrotate
local0.info :omfile:$xcp_rrdd_log

# ignore default rules
*.* ~