Service map backend links by smith · Pull Request #107317 · elastic/kibana

smith · 2021-07-30T17:27:46Z

Add links to backends on service map popovers.

Includes a lot of refactoring of these, but functionally the only difference should be that the backends now show a link to the backends page and stats.

Make the redis icon show up for cache/redis in addition to db/redis.

Fixes #103259

elasticmachine · 2021-08-01T15:31:32Z

Pinging @elastic/apm-ui (Team:apm)

smith · 2021-08-01T18:51:46Z

@elasticmachine run the e2e

x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx

dgieselaar

Link to backend detail page is broken

dgieselaar · 2021-08-04T12:00:22Z

x-pack/plugins/apm/public/components/app/service_map/Popover/index.tsx

+  if (selectedNodeData[SPAN_TYPE] === 'resource') {
+    return ResourceContents;
+  }


Is this the RUM agent(s) fall-back? Should we exclude by agent rather than by span type?

If it's an HTTP request (external/http) it could be called by a RUM agent or any other service, so we could be excluding links that do have backend data.

I suppose we could also make it so these do have stats and links, but then we would have the asymmetry of them being excluded from the dependencies table for RUM services.

not sure I follow, we exclude all RUM calls, regardless of span types in the backend views

The node data on the client does not have the agent name of the service it was called by, so we would have to make some modifications on the server to get this.

The node data available looks like:

{ id: ">sqlite" label: "sqlite" span.destination.service.resource: "sqlite" span.subtype: "sqlite" span.type: "db" }

So I think looking for resource is a reasonable way to do this for now.

x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx

x-pack/plugins/apm/server/lib/service_map/get_service_map_backend_node_info.ts

dgieselaar · 2021-08-04T12:13:02Z

re:

Make the redis icon show up for cache/redis in addition to db/redis.

I think this will (should) be fixed by elastic/apm#443

smith · 2021-08-05T15:33:46Z

x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx

+import { StatsList } from './stats_list';
+
+export function BackendContents({ nodeData }: ContentsProps) {
+  const { query } = useApmParams('/*');


@dgieselaar

if I do useApmParams('/*');, then when I call apmRouter.link below with query I get:

info x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx:53:5 - error TS2322: Type '{} | { pageStep?: AgentConfigurationPageStep | undefined; } | { name?: string | undefined; environment?: string | undefined; pageStep?: AgentConfigurationPageStep | undefined; } | ... 5 more ... | ({ ...; } & { ...; })' is not assignable to type '({ rangeFrom?: string | undefined; rangeTo?: string | undefined; environment?: string | undefined; kuery?: string | undefined; } & { comparisonEnabled?: string | undefined; comparisonType?: string | undefined; }) | undefined'. Type '{ pageStep?: AgentConfigurationPageStep | undefined; }' has no properties in common with type '{ rangeFrom?: string | undefined; rangeTo?: string | undefined; environment?: string | undefined; kuery?: string | undefined; } & { comparisonEnabled?: string | undefined; comparisonType?: string | undefined; }'. 53 query, ~~~~~ x-pack/plugins/apm/public/components/routing/home/index.tsx:57:5 57 query: t.partial({ ~~~~~~~~~~~~~~~~~~ 58 rangeFrom: t.string, ~~~~~~~~~~~~~~~~~~~~~~~~~~ ... 61 kuery: t.string, ~~~~~~~~~~~~~~~~~~~~~~ 62 }), ~~~~~~ The expected type comes from property 'query' which is declared here on type '{ query?: { rangeFrom?: string | undefined; rangeTo?: string | undefined; environment?: string | undefined; kuery?: string | undefined; } | undefined; } & { query?: { comparisonEnabled?: string | undefined; comparisonType?: string | undefined; } | undefined; } & { ...; }'

Since the only think I'm using query for is to pass into link below should I just do useApmParams('/backends/:backendName/overview') here? Or just as up the call below?

Nevermind I can't do useApmParams('/backends/:backendName/overview'), because then I get no matching route.

...I just used query as any below

...or query as TypeOf< ApmRoutes, '/backends/:backendName/overview' >['query'],

smith · 2021-08-06T03:44:13Z

@elasticmachine merge upstream

kibanamachine · 2021-08-06T06:09:41Z

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`apm`	4.3MB	4.3MB	+280.0B

History

💚 Build #143348 succeeded 2cc48b1
💚 Build #143282 succeeded 808ccdf
💔 Build #142966 failed 7216bab
💔 Build #142956 failed fa5fdbd
💚 Build #142671 succeeded 549a910

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

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

kibanamachine · 2021-08-06T06:23:05Z

💚 Backport successful

Status	Branch	Result
✅	7.x

This backport PR will be merged automatically after passing CI.

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Nathan L Smith <nathan.smith@elastic.co>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

…-png-pdf-report-type * 'master' of github.com:elastic/kibana: (392 commits) update linting doc (elastic#105748) [APM] Various improvements from elastic#104851 (elastic#107726) Update dependency @elastic/charts to v33.2.0 (master) (elastic#107842) Fix default route link on kibana homepage (elastic#107809) [APM] Invalidate trackPageview on route change (elastic#107741) Service map backend links (elastic#107317) [index patterns] index pattern create modal (elastic#101853) [RAC] integrating rbac search strategy with alert table (elastic#107242) [Security Solution] Siem signals -> alerts as data field and index aliases (elastic#106049) [Metrics UI] Add checkbox to optionally drop partial buckets (elastic#107676) [Metrics UI] Fix metric threshold preview regression (elastic#107674) Disable Product check in @elastic/elasticsearch-js (elastic#107642) [App Search] Migrate Crawler Status Indicator, Crawler Status Banner, and Crawl Request polling (elastic#107603) [Security Solution, Lists] Replace legacy imports from 'elasticsearch' package (elastic#107226) [maps] asset tracking tutorial (elastic#104552) [scripts/build_ts_refs] when using `--clean` initialize caches (elastic#107777) Upgrade EUI to v36.1.0 (elastic#107231) [RAC] [TGrid] Implements cell actions in the TGrid (elastic#107771) Realign cypress/ccs_integration with cypress/integration (elastic#107743) Allow optional OSS to X-Pack dependencies (elastic#107432) ... # Conflicts: # x-pack/examples/reporting_example/public/application.tsx # x-pack/examples/reporting_example/public/components/app.tsx # x-pack/plugins/canvas/public/services/legacy/stubs/reporting.ts # x-pack/plugins/reporting/common/types.ts # x-pack/plugins/reporting/public/lib/reporting_api_client/context.tsx # x-pack/plugins/reporting/public/management/mount_management_section.tsx # x-pack/plugins/reporting/public/management/report_listing.test.tsx # x-pack/plugins/reporting/public/plugin.ts # x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx # x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts

smith added 3 commits July 30, 2021 09:22

sorta workin

51bc632

Merge remote-tracking branch 'upstream/master' into nls/map-backend-link

49614ef

popover refactoring

7e7e30e

smith added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes auto-backport Deprecated - use backport:version if exact versions are needed v7.15.0 labels Jul 30, 2021

smith added 3 commits July 30, 2021 16:00

everything but the endpoint

5792487

backend stuff

0b1151c

use vars

a4e929a

smith marked this pull request as ready for review August 1, 2021 15:30

smith requested a review from a team August 1, 2021 15:30

ok another var

1b21563

botelastic bot added the Team:APM - DEPRECATED Use Team:obs-ux-infra_services. label Aug 1, 2021

smith added 2 commits August 1, 2021 10:32

Merge remote-tracking branch 'upstream/master' into nls/map-backend-link

d8c83db

type and i18n fixes

ed39a25

Fix stories

5ffe960

dgieselaar reviewed Aug 3, 2021

View reviewed changes

x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx Outdated Show resolved Hide resolved

dgieselaar reviewed Aug 3, 2021

View reviewed changes

x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx Show resolved Hide resolved

dgieselaar suggested changes Aug 3, 2021

View reviewed changes

smith added 2 commits August 3, 2021 09:19

Merge remote-tracking branch 'upstream/master' into nls/map-backend-link

23472fb

Updates based on feedback

549a910

smith requested a review from dgieselaar August 3, 2021 14:42

dgieselaar reviewed Aug 4, 2021

View reviewed changes

x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx Outdated Show resolved Hide resolved

dgieselaar reviewed Aug 4, 2021

View reviewed changes

x-pack/plugins/apm/server/lib/service_map/get_service_map_backend_node_info.ts Outdated Show resolved Hide resolved

Merge remote-tracking branch 'upstream/master' into nls/map-backend-link

218f3fd

Always use ProcessorEvent.metric and fix router link in backend popover

fa5fdbd

smith requested a review from dgieselaar August 4, 2021 13:52

smith added 2 commits August 4, 2021 09:17

Fix types

7216bab

Merge remote-tracking branch 'upstream/master' into nls/map-backend-link

37ac338

smith commented Aug 5, 2021

View reviewed changes

smith added 3 commits August 5, 2021 10:45

Type fix

808ccdf

Merge remote-tracking branch 'upstream/master' into nls/map-backend-link

de6f2e1

use route type instead of any

2cc48b1

Merge branch 'master' into nls/map-backend-link

3053fbe

dgieselaar approved these changes Aug 6, 2021

View reviewed changes

dgieselaar merged commit 43868ac into elastic:master Aug 6, 2021

kibanamachine mentioned this pull request Aug 6, 2021

[7.x] Service map backend links (#107317) #107824

Merged

kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Aug 6, 2021

Service map backend links (elastic#107317)

df281c9

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

kibanamachine added a commit that referenced this pull request Aug 6, 2021

Service map backend links (#107317) (#107824)

bbf4e28

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Nathan L Smith <nathan.smith@elastic.co>

streamich pushed a commit to vadimkibana/kibana that referenced this pull request Aug 8, 2021

Service map backend links (elastic#107317)

5f71851

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Conversation

smith commented Jul 30, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elasticmachine commented Aug 1, 2021

Uh oh!

smith commented Aug 1, 2021

Uh oh!

Uh oh!

Uh oh!

dgieselaar left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dgieselaar commented Aug 4, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

smith commented Aug 6, 2021

Uh oh!

kibanamachine commented Aug 6, 2021

💚 Build Succeeded

Metrics [docs]

Async chunks

History

Uh oh!

kibanamachine commented Aug 6, 2021

💚 Backport successful

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

smith commented Jul 30, 2021 •

edited

Loading