From 0a3a6eb97a765438ae34fbec46fe62c9bcdf7a78 Mon Sep 17 00:00:00 2001 From: XenServer Date: Wed, 5 Mar 2025 22:31:00 +0000 Subject: [PATCH 1/2] Sync with xenserver-release-v8.4.0-17.tar.gz * Thu Mar 13 2025 Gerald Elder-Vass - 8.4.0-18 - CA-407370: Separate rsyslog configs for xenserver and customer (yes, the tarball version doesn't match the changelog entry, but both the tarball version and the SRPM release number are right) Signed-off-by: Samuel Verschelde --- src/common/etc/rsyslog.d/xenserver.conf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/etc/rsyslog.d/xenserver.conf b/src/common/etc/rsyslog.d/xenserver.conf index be872295..d59c633c 100644 --- a/src/common/etc/rsyslog.d/xenserver.conf +++ b/src/common/etc/rsyslog.d/xenserver.conf @@ -1,3 +1,8 @@ +# -- DO NOT EDIT THIS FILE -- +# xenserver.conf contains the XenServer specific logging configurations +# Any remote forwarding should be configured in another file in /etc/rsyslog.d/ +# e.g. /etc/rsyslog.d/remote.conf + # Suppress duplicate messages and report "Last line repeated n times" $RepeatedMsgReduction on @@ -86,7 +91,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 -*.* ~ - From b437967d170c76f72d6992849d9531f1f37cdfe2 Mon Sep 17 00:00:00 2001 From: Samuel Verschelde Date: Mon, 22 Sep 2025 18:32:10 +0200 Subject: [PATCH 2/2] Adapt /etc/rsyslog.d/xenserver.conf header for XCP-ng * Mention XCP-ng in addition to XenServer. I didn't completely replace XenServer with XCP-ng. After all, the file is still named xenserver.conf, so that would be awkward. * Do NOT invite users to edit /etc/rsyslog.d/remote.conf, which is managed by XAPI. * Discourage any custom modifications, but in the case where it's unavoidable, redirect them to /etc/rsyslog.d/custom.conf, after validation by technical support. Signed-off-by: Samuel Verschelde --- src/common/etc/rsyslog.d/xenserver.conf | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/common/etc/rsyslog.d/xenserver.conf b/src/common/etc/rsyslog.d/xenserver.conf index d59c633c..ff08c488 100644 --- a/src/common/etc/rsyslog.d/xenserver.conf +++ b/src/common/etc/rsyslog.d/xenserver.conf @@ -1,7 +1,14 @@ # -- DO NOT EDIT THIS FILE -- -# xenserver.conf contains the XenServer specific logging configurations -# Any remote forwarding should be configured in another file in /etc/rsyslog.d/ -# e.g. /etc/rsyslog.d/remote.conf +# 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 +# files are applied. # Suppress duplicate messages and report "Last line repeated n times" $RepeatedMsgReduction on