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

Cherry-pick #3671 to 5.x: Fix elasticsearch url parsing #3849

Merged
merged 2 commits into from
Mar 31, 2017

Conversation

monicasarbu
Copy link
Contributor

Cherry-pick of PR #3671 to 5.x branch. Original message:

use regex to check if host given contains the protocol scheme. If scheme is
missing, prepend before attempting to parse the complete URL

use regex to check if host given contains the protocol scheme. If scheme is
missing, prepend before attempting to parse the complete URL
(cherry picked from commit 1391731)
@@ -45,6 +45,8 @@ https://github.com/elastic/beats/compare/v5.3.0...master[Check the HEAD diff]
*Affecting all Beats*

- Update index mappings to support future Elasticsearch 6.X. {pull}3778[3778]
- Add `_id`, `_type`, `_index` and `_score` fields in the generated index pattern. {pull}3282[3282]
Copy link
Member

Choose a reason for hiding this comment

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

Does this line belong here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch! It wasn't in the initial one. I will delete it manually.

@monicasarbu
Copy link
Contributor Author

@ruflin Done! When merging, please using the squash option.

@andrewkroh andrewkroh merged commit 28f76b8 into elastic:5.x Mar 31, 2017
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.

3 participants