[check_marathon] Add marathon disable_ssl_validation and group support #3140
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
masci
suggested changes
Jan 24, 2017
|
|
||
| instance_tags = instance.get('tags', []) | ||
| default_timeout = self.init_config.get('default_timeout', self.DEFAULT_TIMEOUT) | ||
| timeout = float(instance.get('timeout', default_timeout)) | ||
|
|
||
| # Marathon apps | ||
| response = self.get_json(urljoin(url, "v2/apps"), timeout, auth) | ||
| if group is None: | ||
| marathon_path = urljoin(url, "v2/apps") |
There was a problem hiding this comment.
Can you fix the indentation here? Flake8 is complaining and the CI fails
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.
What does this PR do?
Add support to marathon for:
disable_ssl_validation: to bypass bad or self-signed certs
group: to get a subset of apps running in marathon (https://mesosphere.github.io/marathon/docs/application-groups.html)
Motivation
Optional features to support different usecases
Testing Guidelines
Tests already exist for check_marathon
Additional Notes
none that I know of