[rsyslog]: Use RELP instead of UDP for forwarding from container to host #18113
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
|
Contributor
Author
There was a problem hiding this comment. Yes, bullseye is still being used for a couple containers. |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,34 +13,28 @@ | |
| #### MODULES #### | ||
| ################# | ||
|
|
||
| {% set gconf = (SYSLOG_CONFIG | d({})).get('GLOBAL', {}) -%} | ||
| {% set rate_limit_interval = gconf.get('rate_limit_interval') -%} | ||
| {% set rate_limit_burst = gconf.get('rate_limit_burst') -%} | ||
|
|
||
| module(load="imuxsock" {% if rate_limit_interval is not none %}SysSock.RateLimit.Interval="{{ rate_limit_interval }}"{% endif %} {% if rate_limit_burst is not none %}SysSock.RateLimit.Burst="{{ rate_limit_burst }}"{% endif %}) # provides support for local system logging | ||
| module(load="imklog") # provides kernel logging support | ||
| #module(load="immark") # provides --MARK-- message capability | ||
|
|
||
| # provides UDP syslog reception | ||
|
Contributor
There was a problem hiding this comment. @saiarcot895 This UDP syslog is for remote server?
Contributor
Author
There was a problem hiding this comment. Yes, in the case of a remote syslog server sending over UDP. |
||
| #module(load="imudp") | ||
| #input(type="imudp" port="514") | ||
|
|
||
| # provides TCP syslog reception | ||
| #module(load="imtcp") | ||
| #input(type="imtcp" port="514") | ||
|
|
||
| # provides RELP syslog reception | ||
| module(load="imrelp") | ||
| input(type="imrelp" address="{{udp_server_ip}}" port="2514") | ||
| {% if docker0_ip and docker0_ip != "" %} | ||
| input(type="imrelp" address="{{docker0_ip}}" port="2514") | ||
| {% endif%} | ||
|
|
||
|
|
||
| ########################### | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,21 +13,21 @@ | |
| #### MODULES #### | ||
| ################# | ||
|
|
||
| module(load="imuxsock" ) # provides support for local system logging | ||
| module(load="imklog") # provides kernel logging support | ||
| #module(load="immark") # provides --MARK-- message capability | ||
|
|
||
| # provides UDP syslog reception | ||
| #module(load="imudp") | ||
| #input(type="imudp" port="514") | ||
|
|
||
| # provides TCP syslog reception | ||
| #module(load="imtcp") | ||
| #input(type="imtcp" port="514") | ||
|
|
||
| # provides RELP syslog reception | ||
| module(load="imrelp") | ||
| input(type="imrelp" address="1.1.1.1" port="2514") | ||
|
|
||
|
Comment on lines
20
to
31
There was a problem hiding this comment. The expected output still has UDP reception commented out (and without address=...), but files/image_config/rsyslog/rsyslog.conf.j2 currently renders active imudp inputs with an address and port. Update/regenerate this sample output to match the template output (and also adjust the SONiCFileFormat timestamp line in this file to reflect the template change to %TIMESTAMP%). |
||
|
|
||
| ########################### | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,23 +13,22 @@ | |
| #### MODULES #### | ||
| ################# | ||
|
|
||
| module(load="imuxsock" ) # provides support for local system logging | ||
| module(load="imklog") # provides kernel logging support | ||
| #module(load="immark") # provides --MARK-- message capability | ||
|
|
||
| # provides UDP syslog reception | ||
| #module(load="imudp") | ||
| #input(type="imudp" port="514") | ||
|
|
||
| # provides TCP syslog reception | ||
| #module(load="imtcp") | ||
| #input(type="imtcp" port="514") | ||
|
|
||
| # provides RELP syslog reception | ||
| module(load="imrelp") | ||
| input(type="imrelp" address="1.1.1.1" port="2514") | ||
| input(type="imrelp" address="2.2.2.2" port="2514") | ||
|
|
||
|
Comment on lines
20
to
33
There was a problem hiding this comment. Same as rsyslog.conf: this expected output keeps the UDP reception commented out and missing address=, but rsyslog.conf.j2 renders active imudp inputs (including both udp_server_ip and docker0_ip). Please regenerate/update this sample output to match the template output (and also update the SONiCFileFormat timestamp line in this file to use %TIMESTAMP% per the template). |
||
|
|
||
| ########################### | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -865,8 +865,8 @@ def test_rsyslog_conf(self): | |||||
| pattern = r'^action.*Device="eth0".*' | ||||||
| for line in file: | ||||||
| assert not bool(re.match(pattern, line.strip())), "eth0 is not allowed in Mgfx device" | ||||||
| expected = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'rsyslog.conf') | ||||||
| self.assertTrue(utils.cmp(expected, self.output_file), self.run_diff(expected, self.output_file)) | ||||||
|
|
||||||
| def test_rsyslog_conf_docker0_ip(self): | ||||||
| if utils.PYvX_DIR != 'py3': | ||||||
|
|
@@ -881,8 +881,8 @@ def test_rsyslog_conf_docker0_ip(self): | |||||
|
|
||||||
| argument = ['-j', config_db_json, '-t', conf_template, '-a', additional_data] | ||||||
| self.run_script(argument, output_file=self.output_file) | ||||||
| expected = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'rsyslog_with_docker0.conf') | ||||||
|
||||||
| expected = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'rsyslog_with_docker0.conf') | |
| expected = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'rsyslog_same_ip.conf') |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@saiarcot895 can you mention this syntax change in PR description
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.