[Heartbeat] Use service.name not service_name in configs#20330
Merged
andrewvc merged 15 commits intoelastic:masterfrom Nov 12, 2020
Merged
[Heartbeat] Use service.name not service_name in configs#20330andrewvc merged 15 commits intoelastic:masterfrom
andrewvc merged 15 commits intoelastic:masterfrom
Conversation
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
Contributor
|
Pinging @elastic/uptime (Team:Uptime) |
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
|
Contributor
|
Pinging @elastic/ingest-management (Team:Ingest Management) |
Contributor
|
@andrewvc I don't think this is linked to Fleet so i've removed the team label, I've looked at the PR I think there are some debugger traces that you left in that PR. |
Contributor
|
Hello @andrewvc,
# EXPERIMENT - NOT SUPPORTED CONFIGURATION SNIPPET
heartbeat.monitors:
- type: http
id: www-frontend-monitor
name: Website Frontend Monitor
service:
name: www-frontend
environment: production
urls: ["https://www.my-ecommerce-company.com/status"]
schedule: '@every 10s'
check.response.status: 200
timeout: 2s
- type: http
id: www-frontend-monitor-staging
name: Website Frontend Monitor - Staging
service:
name: www-frontend
environment: staging
urls: ["https://www.staging.my-ecommerce-company.com/status"]
schedule: '@every 10s'
check.response.status: 200
timeout: 5s |
Contributor
Author
|
@cyrille-leclerc apologies, this fell through the cracks. It won't make 7.10.0 but it can make 7.10.1. I 100% agree we should also add an environment field (that would go in 7.11.0) I've created a separate issue for the env stuff here: elastic/uptime#272 |
Contributor
|
Many thanks @andrewvc |
Contributor
Author
|
I've updated this PR to handle both |
Contributor
💚 Flaky test reportTests succeeded. Expand to view the summary
Test stats 🧪
|
blakerouse
approved these changes
Nov 12, 2020
Contributor
blakerouse
left a comment
There was a problem hiding this comment.
Looks good, like the fallback to old setting.
andrewvc
added a commit
to andrewvc/beats
that referenced
this pull request
Nov 12, 2020
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
added a commit
that referenced
this pull request
Nov 12, 2020
…2574) 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. (cherry picked from commit 425271b)
Contributor
|
Thanks @andrewvc |
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
5 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.
Using the nesting this way lets us handle future fields like
service.environmentmore 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.