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

Cherry-pick #20330 to 7.x: [Heartbeat] Use service.name not service_name in configs #22574

Merged
merged 1 commit into from
Nov 12, 2020

Conversation

andrewvc
Copy link
Contributor

@andrewvc andrewvc commented Nov 12, 2020

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

Using the nesting this way lets us handle future fields like
service.environment more cleanly if/when they become available.

See https://github.com/elastic/ecs/blob/master/rfcs/text/0002-rfc-environment.md
for the proposal to add service.environment

This is a follow-up to #19932 which has not yet been released, so this is not a breaking change.

CC @cyrille-leclerc who pointed out that this would be better.

Using the nesting this way lets us handle future fields like
service.environment more cleanly if/when they become available.

See https://github.com/elastic/ecs/blob/master/rfcs/text/0002-rfc-environment.md
for the proposal to add service.environment

This is a follow-up to elastic#19932 which has not yet been released, so this is not a breaking change.

(cherry picked from commit 425271b)
@andrewvc andrewvc requested a review from a team as a code owner November 12, 2020 20:22
@andrewvc andrewvc added [zube]: In Review backport Team:obs-ds-hosted-services Label for the Observability Hosted Services team labels Nov 12, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 12, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime (Team:Uptime)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 12, 2020
Copy link
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.

@elasticmachine
Copy link
Collaborator

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 923
Skipped 13
Total 936

@elasticmachine
Copy link
Collaborator

💚 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 #22574 opened]

  • Start Time: 2020-11-12T20:23:08.025+0000

  • Duration: 26 min 1 sec

Test stats 🧪

Test Results
Failed 0
Passed 923
Skipped 13
Total 936

@andrewvc andrewvc merged commit 166761e into elastic:7.x Nov 12, 2020
@andrewvc andrewvc deleted the backport_20330_7.x branch November 12, 2020 21:33
@cyrille-leclerc
Copy link
Contributor

Thanks @andrewvc

@zube zube bot removed the [zube]: Done label Feb 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:obs-ds-hosted-services Label for the Observability Hosted Services team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants