-
Notifications
You must be signed in to change notification settings - Fork 88
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
Remove deprecated SSL settings and simplify SSL configuration #213
Remove deprecated SSL settings and simplify SSL configuration #213
Conversation
Got a failure on 7.x https://app.travis-ci.com/github/logstash-plugins/logstash-input-elasticsearch/jobs/628037127 that looked unrelated and suspiciously like a race condition. I reloaded that cell. |
For reviewer: I found reviewing this work to be very helpful in making sense of the removals https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/185/files |
3f3d572
to
cde2f75
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Partial review while we finalize the exact wording in docs, but let's get started with marking old settings as obsolete
before removal
TODO:
|
@@ -52,6 +52,19 @@ | |||
end | |||
end | |||
|
|||
describe 'handling obsolete settings' do |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Inspired by tests in logstash-plugins/logstash-input-http#182 credit @robbavey
c74627d
to
6caee6d
Compare
57654c7
to
9b1f74c
Compare
docs/index.asciidoc
Outdated
@@ -608,12 +610,12 @@ option when authenticating to the Elasticsearch server. If set to an | |||
empty string authentication will be disabled. | |||
|
|||
|
|||
[id="plugins-{type}s-{plugin}-deprecated-options"] | |||
==== Elasticsearch Input deprecated configuration options | |||
[id="plugins-{type}s-{plugin}-removed-options"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the docs update, let's follow the example in logstash-plugins/logstash-output-http@2fae93e#diff-cae5619b3d18ec99c5ccd0a9f6de0c6d3f53343c64692444551a7d29da6863e7
ie, remove all inline references to deprecated settings, and add a dedicated section at the bottom, above "common options", with a link to that section just before the config table.
cc @karenzone
9b1f74c
to
c2bd0e6
Compare
Rebased and updated documentation to match logstash-plugins/logstash-output-http#147 |
Corresponding docs PR elastic/logstash#16744 in LS |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copy/paste error and a comment nit
c2bd0e6
to
876bf13
Compare
Should be good to go after a rebase |
876bf13
to
69c6aac
Compare
Pushed the rebase. I think outstanding work after merge is:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM - over to you @karenzone to check out doc changes
69c6aac
to
e0ff435
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your work on this, @donoghuc. I left suggestion inline.
Thanks @karenzone I committed your suggestion. |
@donoghuc, one more thing I noticed after I got the docs building successfully.
Should it be deleted as part of |
This commit updates SSL settings to be marked as obsolete: - Replace `ssl` with `ssl_enabled` - Replace `ca_file` with `ssl_certificate_authorities` - Replace `ssl_certificate_verification` with `ssl_verification_mode` `setup_ssl_params!` has been updated to only handle SSL inference when not explicitly configured.
953aa8d
to
3cef0e3
Compare
You are right! I just deleted that and squashed all the commits to clean up before merging :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please delete duplicate note. Otherwise, LGTM!
4135b5c
to
c225e46
Compare
During a rebase the latest 4 series entry was deleted. This restores it.
c225e46
to
cd2e2fd
Compare
Get rid of the deprecated parameters and document their removal. Ensure the integration and unit tests pass and that the removals are clearly documented.
Closes #210