Add --syslog to vic-machine configure #8512
Merged
Conversation
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
62f9285 to
93d2c20
Compare
2a54428 to
93d2c20
Compare
wjun
reviewed
Mar 26, 2019
| @@ -373,6 +373,8 @@ func (d *Data) CopyNonEmpty(src *Data) error { | |||
|
|
|||
| d.RegistryCAs = src.RegistryCAs | |||
|
|
|||
| d.SyslogConfig = src.SyslogConfig | |||
There was a problem hiding this comment.
If --syslog-address is not set, will it be reset to empty during configure?
There was a problem hiding this comment.
In func (*Configure) copyChangedConf (), I added code if c.SyslogConfig.Addr != nil to decide whether to change extraconfig.
This is the same way as RegistryCA does.
wjun
reviewed
Mar 26, 2019
wjun
reviewed
Mar 26, 2019
| @@ -15,8 +15,8 @@ | |||
| *** Settings *** | |||
| Documentation Test 6-15 - Verify remote syslog | |||
| Resource ../../resources/Util.robot | |||
| Suite Setup Install VIC Appliance To Test Server additional-args=--syslog-address tcp://%{SYSLOG_SERVER}:514 --debug 1 | |||
| Suite Teardown Cleanup VIC Appliance On Test Server | |||
| #Suite Setup Install VIC Appliance To Test Server additional-args=--syslog-address tcp://%{SYSLOG_SERVER}:514 --debug 1 | |||
wjun
reviewed
Mar 26, 2019
|
|
||
|
|
||
| *** Test Cases *** | ||
| Verify VCH Configure remote syslog |
There was a problem hiding this comment.
It is better to move VCH configure test behind create test.
wjun
reviewed
Mar 26, 2019
| @@ -32,7 +32,6 @@ Get Remote PID | |||
| Should Not Be Empty ${pid} | |||
| [Return] ${pid} | |||
|
|
|||
| *** Test Cases *** | |||
| Verify VCH remote syslog | |||
There was a problem hiding this comment.
Please make sure container logs are forwarded to the syslog server too. If the test misses, please help to add. Also, 6-15-Syslog.md needs to update if required.
There was a problem hiding this comment.
Yes. Container log is checked by this test case
93d2c20 to
415c8fd
Compare
1. move --syslog flag from create to common 2. enable --syslog flag for both create and configure 3. modify CopyNonEmpty(), copyChangedConf() which writes changed attribute to extraconfig
415c8fd to
3463371
Compare
wjun
approved these changes
Mar 28, 2019
yuyangbj
approved these changes
Apr 12, 2019
YanzhaoLi
added a commit
to YanzhaoLi/vic
that referenced
this pull request
Apr 26, 2019
This reverts commit 1d749af.
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.
attribute to extraconfig
Creating base file structureCalling GET /infonot to occurFixes #8501
[specific ci=6-15-Syslog]