[Heartbeat] Add httpcommon options to ZipURL#27699
Merged
andrewvc merged 9 commits intoelastic:masterfrom Sep 8, 2021
Merged
Conversation
Contributor
|
Pinging @elastic/uptime (Team:Uptime) |
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪💚 Flaky test reportTests succeeded. Expand to view the summary
Test stats 🧪
|
justinkambic
reviewed
Sep 2, 2021
Contributor
justinkambic
left a comment
There was a problem hiding this comment.
I'm seeing the desired output, and it goes away when I remove the unsupported protocol from the config. Smoke test is looking good. Unsure if there are any other variables to check.
vigneshshanmugam
approved these changes
Sep 7, 2021
Member
vigneshshanmugam
left a comment
There was a problem hiding this comment.
Code changes LGTM, Would need to cleanup heartbeat.yml before merging in.
vigneshshanmugam
approved these changes
Sep 7, 2021
Contributor
Author
|
@Mergifyio backport 7.x |
Contributor
|
Command
|
andrewvc
pushed a commit
that referenced
this pull request
Sep 8, 2021
mdelapenya
added a commit
to mdelapenya/beats
that referenced
this pull request
Sep 9, 2021
* master: (39 commits) [Heartbeat] Move JSON tests from python->go (elastic#27816) docs: simplify permissions for Dockerfile COPY (elastic#27754) Osquerybeat: Fix osquery logger plugin severy levels mapping (elastic#27789) [Filebeat] Update compatibility function to remove processor description on ES < 7.9.0 (elastic#27774) warn log entry and no validation failure when both queue_url and buck… (elastic#27612) libbeat/cmd/instance: ensure test config file has appropriate permissions (elastic#27178) [Heartbeat] Add httpcommon options to ZipURL (elastic#27699) Add a header round tripper option to httpcommon (elastic#27509) [Elastic Agent] Add validation to ensure certificate paths are absolute. (elastic#27779) Rename dashboards according to module.yml files for master (elastic#27749) Refactor vagrantfile, add scripts for provisioning with docker/kind (elastic#27726) Accept syslog dates with leading 0 (elastic#27775) [Filebeat] Add timezone config option to decode_cef and syslog input (elastic#27727) [Filebeat] Threatintel compatibility updates (elastic#27323) Add support for ephemeral containers in elastic agent dynamic provider (elastic#27707) [Filebeat] Integration tests in CI for AWS-S3 input (elastic#27491) Fix flakyness of TestFilestreamEmptyLine (elastic#27705) [Filebeat] kafka v2 using parsers (elastic#27335) Update Kafka version parsing / supported range (elastic#27720) Update Sarama to 1.29.1 (elastic#27717) ...
Icedroid
pushed a commit
to Icedroid/beats
that referenced
this pull request
Nov 1, 2021
Support httpcommon options for zip_url sources for browser based monitors. This adds custom SSL, proxy, and timeout options. Fixes elastic#27597
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Support
httpcommonoptions forzip_urlsources for browser based monitors. This adds custom SSL, proxy, and timeout options.Fixes #27597
Why is it important?
In large enterprises its common to use custom CAs, proxies, etc.
Checklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.How to test this PR locally
You'll need to run this in the
x-pack/heartbeatdirectory with the following monitor config that proves thessloptions provided byhttpcommonare in effect. The below config intentionally uses an outdated protocol (TLSv1.0) which github will refuse to serve.Should yield the following error event (which I've helpfully JSON formatted here. It can be easier to test this with the
output.console: ~instead of the defaultoutput.elasticsearchoption.{ "@timestamp": "0001-01-01T00:00:00.000Z", "@metadata": { "beat": "heartbeat", "type": "_doc", "version": "8.0.0" }, "error": { "message": "could not fetch for suite job: could not check if zip source changed for https://github.com/elastic/synthetics-demo/archive/refs/heads/main.zip: Head \"https://github.com/elastic/synthetics-demo/archive/refs/heads/main.zip\": remote error: tls: protocol version not supported", "type": "io" }, "tags": ["todos-app"], "event": { "dataset": "browser" }, "ecs": { "version": "1.11.0" }, "agent": { "ephemeral_id": "75134b46-d5df-4c86-afd0-f0edeb98b471", "id": "676de04f-0e18-4be3-ac13-eaa611089369", "name": "LAPTOP-80O11FM2", "type": "heartbeat", "version": "8.0.0" }, "observer": { "ip": ["172.31.124.252", "fe80::215:5dff:feab:a8f0"], "mac": ["ce:16:bd:46:2b:a8", "1a:2f:00:7f:96:e6", "00:15:5d:ab:a8:f0"], "hostname": "LAPTOP-80O11FM2" }, "monitor": { "timespan": { "lt": "2021-09-02T01:39:54.310Z", "gte": "2021-09-02T01:36:54.310Z" }, "id": "todos", "name": "Todos", "status": "down", "type": "browser" } }