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 #8292 to 6.x: Added 'query' parameter to metricbeats global configuration #8463

Merged
merged 2 commits into from
Sep 28, 2018

Conversation

sayden
Copy link
Contributor

@sayden sayden commented Sep 27, 2018

Cherry-pick of PR #8292 to 6.x branch. Original message:

Initial PR on mb package which fixes issue #8286 but I guess it will be better to implement in the HTTP helper. The thing is that the URI parsing of a metricbeat occurs in the mb package so to implement it outside of it could lead to ugly-and-not-so-predictable code

I've tested in local successfully but I haven't found a test that already covers Build() method.

Ideas welcome :)

…8292)

Added 'query' parameter to metricbeats global configuration

(cherry picked from commit 7dbb4f1)
@@ -113,6 +113,8 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff]
- Added 'died' PID state to process_system metricset on system module {pull}8275[8275]
- Add `metrics` metricset to MongoDB module. {pull}7611[7611]
- Added `ccr` metricset to Elasticsearch module. {pull}8335[8335]
- Added support for query params in configuration {issue}8286[8286] {pull}8292[8292]
- Support for Kafka 2.0.0 {pull}8399[8399]
Copy link
Member

Choose a reason for hiding this comment

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

This line is not related to this change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was the conflict on the first PR. Should I remove it?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, this PR should only contain the changes intended to be backported.

@sayden sayden merged commit d32e631 into elastic:6.x Sep 28, 2018
@sayden sayden deleted the backport_8292_6.x branch October 19, 2018 11:34
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