Skip to content

Backport 20387 7.x#20633

Merged
andrewvc merged 3 commits intoelastic:7.xfrom
andrewvc:backport_20387_7.x
Aug 17, 2020
Merged

Backport 20387 7.x#20633
andrewvc merged 3 commits intoelastic:7.xfrom
andrewvc:backport_20387_7.x

Conversation

@andrewvc
Copy link
Copy Markdown
Contributor

@andrewvc andrewvc commented Aug 17, 2020 •
edited by jsoriano
Loading

Resolved the conflicts in #20488 and opened this PR since @blakerouse is out.

Cherry-pick of PR #20387 to 7.x branch. Original message:

What does this PR do?

This adds support for any input with synthetics/* to run heartbeat and send the inputs to heartbeat. This also bundles heartbeat with Elastic Agent in data/downloads.

Note: Currently heartbeat doesn't support the top-level inputs key. Once it does this will just work.

Why is it important?

To support running heartbeat with synthetics inputs.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

blakerouse and others added 3 commits August 6, 2020 16:14
@blakerouse
[Elastic Agent] Add support for synthetics inputs that run heartbeat (e…
f436608 
…lastic#20387)

* Add support for synthetics inputs that run heartbeat.

* Run mage fmt.

* Add changelog.

* Update test configs to use host instead of hosts.

* Enable support for top-level inputs from Elastic Agent.

(cherry picked from commit b153044)
@blakerouse
Fix tests for heartbeat using data_stream.
b537c0a
@andrewvc
Merge remote-tracking branch 'origin/7.x' into backport_20387_7.x
23d34a8
@andrewvc andrewvc added Team:obs-ds-hosted-services Label for the Observability Hosted Services team Agent labels Aug 17, 2020
@andrewvc andrewvc requested a review from a team as a code owner August 17, 2020 12:56
@andrewvc andrewvc self-assigned this Aug 17, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Aug 17, 2020

Pinging @elastic/uptime (Team:Uptime)

@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 Aug 17, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Aug 17, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #20633 opened]

  • Start Time: 2020-08-17T12:57:59.570+0000

  • Duration: 88 min 16 sec

Test stats 🧪

Test Results
Failed 0
Passed 17949
Skipped 1853
Total 19802

Steps errors

Expand to view the steps failures

  • Name: Check out from version control

    • Description: [2020-08-17T12:59:32.131Z] using credential f6c7695a-671e-4f4f-a331-acdce44ff9ba
      [2020-08-17T12:59:

    • Duration: 2 min 13 sec

    • Start Time: 2020-08-17T12:59:29.250+0000

    • log

@andrewvc andrewvc merged commit eeba6f0 into elastic:7.x Aug 17, 2020
@andrewvc andrewvc deleted the backport_20387_7.x branch August 17, 2020 15:51
@andrewvc andrewvc mentioned this pull request Aug 19, 2020
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees

@andrewvc andrewvc

Labels

Agent Team:obs-ds-hosted-services Label for the Observability Hosted Services team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@andrewvc @elasticmachine @jsoriano @blakerouse