Skip to content

Conversation

@blakerouse
Copy link
Contributor

This is a backport of pull request #25219 from the #26587, that just missed the branch of 7x to 7.14.

… (add support for Proxy) (elastic#26587)

* Introduce httpcommon package in libbeat (add support for Proxy) (elastic#25219)

(cherry picked from commit 4accfa8)

# Conflicts:
#	libbeat/monitoring/report/elasticsearch/config.go
#	metricbeat/module/elasticsearch/index/data_test.go

* Fix issues with backport.

* Fix changelog.

* FIx integration tests for ml-importer.

Co-authored-by: Steffen Siering <[email protected]>
Co-authored-by: Blake Rouse <[email protected]>
@blakerouse blakerouse added the Team:Elastic-Agent Label for the Agent team label Jun 30, 2021
@blakerouse blakerouse self-assigned this Jun 30, 2021
@blakerouse blakerouse requested a review from a team as a code owner June 30, 2021 18:24
@elasticmachine
Copy link
Contributor

Pinging @elastic/agent (Team:Agent)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jun 30, 2021
@blakerouse
Copy link
Contributor Author

This just passed in 7.x, going to merge without CI passing in 7.14 as they are the same, and it needs to be in before the first BC1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Team:Elastic-Agent Label for the Agent team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants