[elastic] Add support for SSL (Elasticsearch Shield) #2195
Merged
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
|
Hi @pabrahamsson! Thank you very much for this PR, it's always great to add SSL support to our checks. We'll give this a test-drive and can hopefully merge in your SSL support in very soon! Your code is very much appreciated! |
|
Thanks @truthbk I updated the tests so they pass. |
|
Thanks @pabrahamsson tests look good now. Mind squashing this down? |
pabrahamsson
force-pushed
the
elastic_ssl
branch
from
3c2cb91 to
c536c0f
Compare
|
@irabinovitch squashed, but now showing conflicts, not sure why |
|
@pabrahamsson Try rebasing on master? |
pabrahamsson
force-pushed
the
elastic_ssl
branch
from
9e2cbf4 to
3b476c5
Compare
|
@irabinovitch I think we're good now, learning |
| @@ -424,12 +430,29 @@ def _get_data(self, url, config, send_sc=True): | |||
| else: | |||
| auth = None | |||
|
|
|||
| # Load SSL configuration, if available. | |||
| # ssl_verify can be a bool or a string (http://docs.python-requests.org/en/latest/user/advanced/#ssl-cert-verification) | |||
| if isinstance(config.ssl_verify, bool): | |||
There was a problem hiding this comment.
This could be rewritten more concisely in
if isinstance(config.ssl_verify, bool) or isinstance(config.ssl_verify, str):
verify = config.ssl_verify
else:
verify = None
|
Thanks @remh |
pabrahamsson
force-pushed
the
elastic_ssl
branch
from
bd34ec8 to
165635e
Compare
|
Squashed |
|
Thanks! |
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.
No description provided.