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

[7.x](backport #25219) Introduce httpcommon package in libbeat (add support for Proxy) #26587

Merged
merged 5 commits into from
Jun 30, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 29, 2021

This is an automatic backport of pull request #25219 done by Mergify.
Cherry-pick of 4accfa8 has failed:

On branch mergify/bp/7.x/pr-25219
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 4accfa821.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   dev-tools/cmd/dashboards/export_dashboards.go
	modified:   filebeat/fileset/modules_integration_test.go
	modified:   filebeat/fileset/pipelines_test.go
	modified:   heartbeat/docs/monitors/monitor-http.asciidoc
	modified:   heartbeat/monitors/active/dialchain/tls.go
	modified:   heartbeat/monitors/active/http/config.go
	modified:   heartbeat/monitors/active/http/http.go
	modified:   heartbeat/monitors/active/http/http_test.go
	modified:   heartbeat/monitors/active/http/task.go
	modified:   libbeat/common/transport/client.go
	new file:   libbeat/common/transport/httpcommon/httpcommon.go
	new file:   libbeat/common/transport/httpcommon/proxy.go
	modified:   libbeat/common/transport/tls.go
	modified:   libbeat/common/transport/tlscommon/config.go
	modified:   libbeat/common/transport/tlscommon/server_config.go
	modified:   libbeat/common/transport/tlscommon/tls.go
	modified:   libbeat/common/transport/tlscommon/tls_config.go
	modified:   libbeat/common/transport/tlscommon/types.go
	modified:   libbeat/common/transport/transport.go
	modified:   libbeat/esleg/eslegclient/api_test.go
	modified:   libbeat/esleg/eslegclient/bulkapi_mock_test.go
	modified:   libbeat/esleg/eslegclient/config.go
	modified:   libbeat/esleg/eslegclient/connection.go
	modified:   libbeat/esleg/eslegclient/connection_integration_test.go
	modified:   libbeat/idxmgmt/ilm/client_handler_integration_test.go
	modified:   libbeat/kibana/client.go
	modified:   libbeat/kibana/client_config.go
	modified:   libbeat/licenser/elastic_fetcher_integration_test.go
	modified:   libbeat/licenser/elastic_fetcher_test.go
	modified:   libbeat/monitoring/report/elasticsearch/elasticsearch.go
	modified:   libbeat/outputs/elasticsearch/client.go
	modified:   libbeat/outputs/elasticsearch/client_proxy_test.go
	modified:   libbeat/outputs/elasticsearch/config.go
	modified:   libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc
	modified:   libbeat/outputs/elasticsearch/elasticsearch.go
	modified:   libbeat/outputs/logstash/logstash_integration_test.go
	modified:   libbeat/template/load_integration_test.go
	modified:   metricbeat/helper/config.go
	modified:   metricbeat/helper/http.go
	modified:   metricbeat/helper/http_test.go
	modified:   metricbeat/module/apache/status/status_test.go
	modified:   metricbeat/module/envoyproxy/server/server_test.go
	modified:   x-pack/elastic-agent/CHANGELOG.next.asciidoc
	modified:   x-pack/elastic-agent/pkg/agent/application/pipeline/stream/factory.go
	modified:   x-pack/elastic-agent/pkg/agent/application/upgrade/step_download.go
	modified:   x-pack/elastic-agent/pkg/agent/cmd/container.go
	modified:   x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
	modified:   x-pack/elastic-agent/pkg/artifact/config.go
	modified:   x-pack/elastic-agent/pkg/artifact/download/fs/verifier_test.go
	modified:   x-pack/elastic-agent/pkg/artifact/download/http/downloader.go
	modified:   x-pack/elastic-agent/pkg/artifact/download/http/elastic_test.go
	modified:   x-pack/elastic-agent/pkg/artifact/download/http/verifier.go
	modified:   x-pack/elastic-agent/pkg/artifact/download/localremote/downloader.go
	modified:   x-pack/elastic-agent/pkg/artifact/download/snapshot/downloader.go
	modified:   x-pack/elastic-agent/pkg/remote/client.go
	modified:   x-pack/elastic-agent/pkg/remote/config.go
	modified:   x-pack/elastic-agent/pkg/remote/config_test.go
	modified:   x-pack/filebeat/input/httpjson/config.go
	modified:   x-pack/filebeat/input/httpjson/input.go
	modified:   x-pack/filebeat/input/httpjson/input_cursor.go
	modified:   x-pack/filebeat/input/httpjson/input_stateless.go
	modified:   x-pack/filebeat/input/httpjson/input_test.go
	modified:   x-pack/filebeat/input/httpjson/internal/v2/config.go
	modified:   x-pack/filebeat/input/httpjson/internal/v2/config_request.go
	modified:   x-pack/filebeat/input/httpjson/internal/v2/input.go
	modified:   x-pack/filebeat/input/httpjson/internal/v2/input_cursor.go
	modified:   x-pack/filebeat/input/httpjson/internal/v2/input_stateless.go
	modified:   x-pack/filebeat/input/httpjson/internal/v2/request_test.go
	modified:   x-pack/libbeat/common/cloudfoundry/config.go
	modified:   x-pack/libbeat/common/cloudfoundry/hub.go
	modified:   x-pack/metricbeat/module/openmetrics/collector/_meta/data.json
	modified:   x-pack/metricbeat/module/prometheus/collector/_meta/data.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/monitoring/report/elasticsearch/config.go
	both modified:   metricbeat/module/elasticsearch/index/data_test.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit 4accfa8)

# Conflicts:
#	libbeat/monitoring/report/elasticsearch/config.go
#	metricbeat/module/elasticsearch/index/data_test.go
@mergify mergify bot requested a review from a team as a code owner June 29, 2021 20:17
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 29, 2021
@mergify mergify bot assigned urso Jun 29, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 29, 2021
@botelastic
Copy link

botelastic bot commented Jun 29, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 29, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #26587 updated

  • Start Time: 2021-06-30T14:58:41.845+0000

  • Duration: 157 min 29 sec

  • Commit: 1fe09d6

Test stats 🧪

Test Results
Failed 0
Passed 47835
Skipped 5291
Total 53126

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 47835
Skipped 5291
Total 53126

@mergify
Copy link
Contributor Author

mergify bot commented Jun 29, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-25219 upstream/mergify/bp/7.x/pr-25219
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-25219

@blakerouse blakerouse merged commit 37e37f1 into 7.x Jun 30, 2021
@blakerouse blakerouse deleted the mergify/bp/7.x/pr-25219 branch June 30, 2021 17:57
@blakerouse blakerouse added the backport-v7.14.0 Automated backport with mergify label Jun 30, 2021
mergify bot added a commit that referenced this pull request Jun 30, 2021
…upport for Proxy) (#26587)

* Introduce httpcommon package in libbeat (add support for Proxy) (#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 <steffen.siering@elastic.co>
Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
(cherry picked from commit 37e37f1)
blakerouse added a commit to blakerouse/beats that referenced this pull request Jun 30, 2021
… (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 <steffen.siering@elastic.co>
Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
blakerouse added a commit that referenced this pull request Jun 30, 2021
…upport for Proxy) (#26587) (#26626)

* Introduce httpcommon package in libbeat (add support for Proxy) (#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 <steffen.siering@elastic.co>
Co-authored-by: Blake Rouse <blake.rouse@elastic.co>

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Steffen Siering <steffen.siering@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport backport-v7.14.0 Automated backport with mergify conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants