Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport PR #12749 to 7.x: internal-monitoring: use configured ssl verification mode #12750

Merged
merged 1 commit into from
Mar 16, 2021

Conversation

yaauie
Copy link
Member

@yaauie yaauie commented Mar 16, 2021

Backport PR #12749 to 7.x branch. Original message:

What does this PR do?

Fixes Internal Monitoring to correctly rely on the monitoring.elasticsearch.ssl.verification_mode setting.

Why is it important/What is the impact to the user?

Ensures that explicitly-configured options are used.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files (and/or docker env variables)
  • I have added tests that prove my fix is effective or that my feature works

How to test this PR locally

  • Set up monitoring over SSL (e.g., with https host)
  • Start Logstash
  • Observe no warning about SSL being disabled

Related issues

)

Upstream `ElasticsearchOptions#es_options_from_settings` already uses the
setting `elasticsearch.ssl.verification_mode` to produce an appropriate
boolean-valued `ssl_certificate_verification` in our `es_settings` hash, so
we can rely on it instead of re-checking equality with a string.

(cherry picked from commit d5becc0)
Copy link
Member

@robbavey robbavey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@yaauie yaauie merged commit cecd774 into elastic:7.x Mar 16, 2021
@yaauie yaauie deleted the backport_12749_7.x branch March 16, 2021 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants