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.

Sign up for GitHub

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

Jump to bottom

[Uptime] Use service.name to link from Uptime -> APM where available #73618

Merged
merged 1 commit into from
Jul 29, 2020
Merged

[Uptime] Use service.name to link from Uptime -> APM where available #73618

merged 1 commit into from
Jul 29, 2020

Conversation

andrewvc
Copy link
Contributor

@andrewvc andrewvc commented Jul 29, 2020 •
edited
Loading

With elastic/beats#19932 coming in 7.10 adding the service.name ECS field is very easy. We should prefer this field when cross linking to APM, hence this PR.

Resolves elastic/uptime#220

You can test this using a heartbeat config with a section like:

heartbeat.monitors:
- type: http
  id: elastic-co
  name: Elastic Homepage
  service_name: "MyElasticService"
  urls:
  - https://www.elastic.co
  schedule: "@every 60s"

The APM integrations link should prefer using service.name

Checklist

Delete any items that are not applicable to this PR.

For maintainers

@andrewvc
[Uptime] Use service.name to link from Uptime -> APM where available
6e6c10f 
With elastic/beats#19932 coming in 7.10 adding
the `service.name` ECS field is very easy. We should prefer this field
when cross linking to APM, hence this PR.

Resolves elastic/uptime#220
@andrewvc andrewvc added enhancement New value added to drive a business result Team:Uptime - DEPRECATED Synthetics & RUM sub-team of Application Observability v7.10.0 labels Jul 29, 2020
@andrewvc andrewvc requested a review from a team as a code owner July 29, 2020 03:33
@andrewvc andrewvc self-assigned this Jul 29, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/uptime (Team:uptime)

@andrewvc andrewvc requested a review from shahzad31 July 29, 2020 03:33
@andrewvc andrewvc added release_note:skip Skip the PR/issue when compiling release notes release_note:enhancement and removed release_note:skip Skip the PR/issue when compiling release notes labels Jul 29, 2020
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

async chunks size

id value diff baseline
uptime 1.6MB +636.0B 1.6MB

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

shahzad31
shahzad31 approved these changes Jul 29, 2020
View reviewed changes
Copy link
Contributor

@shahzad31 shahzad31 left a comment

Choose a reason for hiding this comment

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

LGTM !!

@andrewvc andrewvc merged commit 1580a2e into elastic:master Jul 29, 2020
@andrewvc andrewvc deleted the apm-service-name-links branch July 29, 2020 13:51
@andrewvc andrewvc mentioned this pull request Jul 29, 2020
Merged
andrewvc added a commit to andrewvc/kibana that referenced this pull request Jul 29, 2020
@andrewvc
[Uptime] Use service.name to link from Uptime -> APM where available (
d267483 
elastic#73618)

With elastic/beats#19932 coming in 7.10 adding
the `service.name` ECS field is very easy. We should prefer this field
when cross linking to APM, hence this PR.

Resolves elastic/uptime#220
# Conflicts:
#	x-pack/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jul 29, 2020
@gmmorris
Merge branch 'master' into task-manager/fix-flaky-test
8764243 
* master: (126 commits)
  [ML] Disabling ML if license feature is disabled (elastic#73187)
  [ML] Fixing old _xpack style es endpoint paths (elastic#73667)
  [DOCS] [Lens] 7.9 docs refresh (elastic#72301)
  [ML] DF Analytics results: ensure `View` link is only enabled when job has successfully completed (elastic#73539)
  Set timeRange to default to trigger the error message (elastic#73629)
  [ML] Functional tests - stabilize DFA navigation and index pattern handling (elastic#73660)
  [ILM] Add links to "Snapshot and Restore" from ILM "wait for snapshot policy" (elastic#72473)
  [kbn-storybook] Update Storybook to 5.3.19 (elastic#73320)
  [Metrics UI] Fix hasData call to ensure it has data not just indices (elastic#72969)
  [Uptime] Use `service.name` to link from Uptime -> APM where available (elastic#73618)
  allow others to update `URL.revokeObjectURL` property if needed (elastic#73639)
  regen docs (elastic#73650)
  [Visualize] Fix inspector download filename issue when saving in-place (elastic#72605)
  [Data] Query Input String manager (elastic#72093)
  [Security Solutions] Add tooltips (elastic#73436)
  Do not render descriptionless actions within an EuiCard (elastic#73611)
  [Security Solution][Detections] Value Lists Modal supports multiple exports (elastic#73532)
  [Security Solution][Resolver] Handle disabled process collection (elastic#73592)
  [Security_Solution][Bug] Fix user name/domain to ECS structure (elastic#73530)
  [Security Solution][Exceptions] - Update rule.exceptions_list to include exception list list_id (elastic#73349)
  ...
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jul 30, 2020
@gmmorris
Merge branch 'actions/webhook-remove-header' of github.com:gmmorris/k…
031e0d8 
…ibana into actions/webhook-remove-header

* 'actions/webhook-remove-header' of github.com:gmmorris/kibana: (86 commits)
  [maps] rename GisMap to MapContainer and convert to TS (elastic#73690)
  [APM] docs: remove watcher documentation  (elastic#73485)
  [Maps] fix fit to data for Point to Point layer (elastic#73563)
  [Metrics UI] Fix No Data in Inventory alerts/Snapshot API (elastic#72513)
  [ML] Disabling ML if license feature is disabled (elastic#73187)
  [ML] Fixing old _xpack style es endpoint paths (elastic#73667)
  [DOCS] [Lens] 7.9 docs refresh (elastic#72301)
  [ML] DF Analytics results: ensure `View` link is only enabled when job has successfully completed (elastic#73539)
  Set timeRange to default to trigger the error message (elastic#73629)
  [ML] Functional tests - stabilize DFA navigation and index pattern handling (elastic#73660)
  [ILM] Add links to "Snapshot and Restore" from ILM "wait for snapshot policy" (elastic#72473)
  [kbn-storybook] Update Storybook to 5.3.19 (elastic#73320)
  [Metrics UI] Fix hasData call to ensure it has data not just indices (elastic#72969)
  [Uptime] Use `service.name` to link from Uptime -> APM where available (elastic#73618)
  allow others to update `URL.revokeObjectURL` property if needed (elastic#73639)
  regen docs (elastic#73650)
  [Visualize] Fix inspector download filename issue when saving in-place (elastic#72605)
  [Data] Query Input String manager (elastic#72093)
  [Security Solutions] Add tooltips (elastic#73436)
  Do not render descriptionless actions within an EuiCard (elastic#73611)
  ...
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jul 31, 2020
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

1 similar comment
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Aug 5, 2020
andrewvc added a commit that referenced this pull request Aug 5, 2020
@andrewvc
[Uptime] Use service.name to link from Uptime -> APM where available (
4a4b1e0 
#73618) (#73666)

With elastic/beats#19932 coming in 7.10 adding
the `service.name` ECS field is very easy. We should prefer this field
when cross linking to APM, hence this PR.

Resolves elastic/uptime#220
# Conflicts:
#	x-pack/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shahzad31 shahzad31 shahzad31 approved these changes

Assignees

@andrewvc andrewvc

Labels
enhancement New value added to drive a business result release_note:enhancement Team:Uptime - DEPRECATED Synthetics & RUM sub-team of Application Observability v7.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support for APM service.name in Heartbeat/Uptime
4 participants
@andrewvc @elasticmachine @kibanamachine @shahzad31