Skip to content

Cherry-pick #19932 to 7.x: [Heartbeat] Add service_name option for APM integration#20034

Merged
andrewvc merged 1 commit intoelastic:7.xfrom
andrewvc:backport_19932_7.x
Jul 29, 2020
Merged

Cherry-pick #19932 to 7.x: [Heartbeat] Add service_name option for APM integration#20034
andrewvc merged 1 commit intoelastic:7.xfrom
andrewvc:backport_19932_7.x

Conversation

@andrewvc
Copy link
Copy Markdown
Contributor

@andrewvc andrewvc commented Jul 17, 2020 •
edited by zube bot
Loading

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

What does this PR do?

Adds a new standard service_name option to the heartbeat config file. While possible with fields already, adding this as a first class option encourages use of this important field for integration.

First step toward elastic/uptime#220

This PR also refactors some internal bits where we were passing too many parameters already, and adding service_name would just be too much. We now pass a single larger struct for common monitor options which cleans up a lot of the code.

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.

How to test this PR locally

Run against ES with service_name in your config and see that service.name is populated.

@andrewvc
[Heartbeat] Add service_name option for APM integration (elastic#19932)
6d1dc8a 
Adds a new standard service_name option to the heartbeat config file. While possible with fields already, adding this as a first class option encourages use of this important field for integration.

First step toward elastic/uptime#220

This PR also refactors some internal bits where we were passing too many parameters already, and adding service_name would just be too much. We now pass a single larger struct for common monitor options which cleans up a lot of the code.

(cherry picked from commit 6197850)
@andrewvc andrewvc requested a review from a team as a code owner July 17, 2020 17:19
@andrewvc andrewvc added [zube]: In Review backport Team:obs-ds-hosted-services Label for the Observability Hosted Services team labels Jul 17, 2020
@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 Jul 17, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jul 17, 2020

Pinging @elastic/uptime (Team:Uptime)

@andrewvc andrewvc requested a review from blakerouse July 17, 2020 17:20
@andrewvc andrewvc self-assigned this Jul 17, 2020
blakerouse
blakerouse approved these changes Jul 17, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Backport looks good.

@andrewvc andrewvc merged commit 573cff9 into elastic:7.x Jul 29, 2020
@andrewvc andrewvc deleted the backport_19932_7.x branch July 29, 2020 03:31
@zube zube bot removed the [zube]: Done label Oct 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blakerouse blakerouse blakerouse approved these changes

Assignees

@andrewvc andrewvc

Labels

backport 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.

3 participants

@andrewvc @elasticmachine @blakerouse