add support for dcos-log v2 #1105
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
|
run linux integration tests |
09af8d6 to
adc7225
Compare
adc7225 to
bbe72fe
Compare
|
run linux integration tests |
bamarni
reviewed
Nov 21, 2017
cli/dcoscli/log.py
Outdated
| @@ -221,7 +221,19 @@ def has_journald_capability(): | |||
| get_cosmos_url()).has_capability('LOGGING') | |||
|
|
|||
|
|
|||
| def dcos_log_enabled(): | |||
| def has_log_v2_capability(): | |||
| """ function checks thec cosmos capability LOGGING_V2 | |||
cli/dcoscli/node/main.py
Outdated
| :return: leader logs url | ||
| :rtype: str | ||
| """ | ||
|
|
||
| if version < 1 and version > 2: |
There was a problem hiding this comment.
this can't be evaluated to true, did you mean or?
cli/dcoscli/task/main.py
Outdated
|
|
||
| if len(tasks) != 1: | ||
| raise DCOSException( | ||
| "found more then one task with the same name: {}. Please provide " |
cli/dcoscli/task/main.py
Outdated
| :param follow: same as unix tail's -f | ||
| :type follow: bool | ||
| :param task: task pattern to match | ||
| :type task: str |
cli/tests/unit/test_node.py
Outdated
| @mock.patch('dcos.config.get_config_val') | ||
| @mock.patch('dcos.http.get') | ||
| @mock.patch('dcoscli.log.dcos_log_enabled') | ||
| def test_dcos_log_v2_leader_mesos(mocked_dcos_log_enabked, mocked_http_get, |
There was a problem hiding this comment.
there are multiple occurences of mocked_dcos_log_enabked instead of mocked_dcos_log_enabled in this file.
dcos task <name> log will check the LOGGING_V2 capability first. If V2 is enabled, it will be used by default. Otherwise it will check for logging strategy in the cluster and use either mesos files API directly or dcos-log v1.
7b4d2f4 to
3c30a40
Compare
|
run linux integration tests |
|
@bamarni i addressed your comments, please review again |
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.
affected subcommands:
dcos task <name> logdcos node log ...dcos service log <name>If DC/OS cluster has the
LOGGING_V2capability, dcos-cli should use dcos-log v2, otherwise based on the logging strategy mesos files API or dcos-log v1 will be used.