syslog: T5367: add format option to include timezone in message #4061
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add CLI option to include the systems timezone in the syslog message sent to a collector. This can be enabled using: set system syslog host <hostname> format include-timezone
|
👍 |
|
✅ No issues found in unused-imports check.. Please refer the workflow run |
c-po
requested review from
dmbaturin,
sarthurdev,
zdc,
jestabro,
sever-sever and
nicolas-fort
dmbaturin
approved these changes
Sep 15, 2024
jestabro
approved these changes
Sep 15, 2024
sever-sever
reviewed
Sep 16, 2024
| {{ tmp | join(';') }} @@(o){{ host_name | bracketize_ipv6 }}:{{ host_options.port }};RSYSLOG_SyslogProtocol23Format | ||
| {% else %} | ||
| {{ tmp | join(';') }} @@{{ host_name | bracketize_ipv6 }}:{{ host_options.port }} | ||
| {{ tmp | join(';') }} @@{{ '(o)' if host_options.format.octet_counted is vyos_defined }}{{ host_name | bracketize_ipv6 }}:{{ host_options.port }}{{ ';RSYSLOG_SyslogProtocol23Format' if host_options.format.include_timezone is vyos_defined }} |
There was a problem hiding this comment.
As I remember it could be not only for TCP
There was a problem hiding this comment.
What exactly do you mean? Octet counting, or the message format?
There was a problem hiding this comment.
I mean this check is vyos_defined('tcp')
{% if host_options.protocol is vyos_defined('tcp') %}
{% if host_options.format.octet_counted is vyos_defined %}
{{ tmp | join(';') }} @@{{ '(o)' if host_options.format.octet_counted is vyos_defined }}{{ host_name | bracketize_ipv6 }}:{{ host_options.port }}{{ ';RSYSLOG_SyslogProtocol23Format' if host_options.format.include_timezone is vyos_defined }}
But it is probably for another PR
sever-sever
approved these changes
Sep 19, 2024
|
@Mergifyio backport sagitta circinus |
✅ Backports have been created
|
This was referenced Sep 30, 2024
12 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change Summary
Add CLI option to include the systems timezone in the syslog message sent to a collector.
Types of changes
Related Task(s)
Component(s) name
syslog
How to test
set system syslog host <hostname> format include-timezoneSmoketest result
Checklist: