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

[APM] Experimental Service Map front end #46497

Merged
merged 4 commits into from
Oct 8, 2019
Merged

Conversation

smith
Copy link
Contributor

@smith smith commented Sep 24, 2019

Add service map tabs on the main APM screen and for individual services.

This is not yet hooked up to work with back-end data, so it always shows the same hard-coded graph.

This is experimental, so you must have x-pack.apm.serviceMapEnabled: true in your Kibana config for it to show up.

Also add "PSF" to the list of allowed licenses since a new dependency added uses this license (it's on the green list.)

Fixes #44890
Fixes #44853

image

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@formgeist
Copy link
Contributor

@smith Looks great so far. Wondering if we can add a background on the labels so they don't mix with the arrow lines making them hard to read?

Screenshot 2019-09-27 at 10 46 09

Screenshot 2019-09-27 at 10 47 47

In the design I'm using the EuiBadge for labels, but we don't have to do that here. I just imagine a background that matches the background of the map and some padding.

@formgeist
Copy link
Contributor

And the updated background pattern that looks a little more subtle than the current https://codesandbox.io/s/service-maps-background-zuzlk

@smith
Copy link
Contributor Author

smith commented Sep 27, 2019

@formgeist

Looks great so far. Wondering if we can add a background on the labels so they don't mix with the arrow lines making them hard to read?

Adding these options for the node style:

      'text-background-color': theme.euiColorLightestShade,
      'text-background-opacity': 1,
      'text-background-padding': theme.paddingSizes.xs,
      'text-background-shape': 'roundrectangle',

image

additional options are here if you want to suggest more tweaks to the labels: http://js.cytoscape.org/#style/labels

@smith
Copy link
Contributor Author

smith commented Sep 27, 2019

And the updated background pattern that looks a little more subtle than the current codesandbox.io/s/service-maps-background-zuzlk

Updated in a2346863502.

@smith
Copy link
Contributor Author

smith commented Sep 27, 2019

@smith Looks great so far. Wondering if we can add a background on the labels so they don't mix with the arrow lines making them hard to read?

Updated in a2346863502.

@elasticmachine
Copy link
Contributor

💔 Build Failed

@formgeist
Copy link
Contributor

Thanks for the updates @smith - it's really starting to look great 🎉

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@shaunmcgough
Copy link

It's great to see Cytoscape being used here. The work is looking good. Big props from the graph group.

Copy link
Contributor

@spalger spalger left a comment

Choose a reason for hiding this comment

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

Renovate changes look good, not sure about adding PSF to the license whitelist but relying on @peterschretlen to authorize

@spalger spalger requested review from peterschretlen and removed request for peterschretlen October 3, 2019 23:10
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@@ -54,12 +55,13 @@ function createCoreSetupMock() {
}

function createCoreStartMock() {
const mock: MockedKeys<CoreStart> = {
const mock: MockedKeys<LegacyCoreStart> = {
Copy link
Contributor

Choose a reason for hiding this comment

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

This mock incorrect. injectedMetadata is not exposed to the new platform plugin, but legacy plugins only. We decided to provide it for a while until ConfigService is done #47319

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So what should I do if I need to mock injectedVars?

Copy link
Contributor

@mshustov mshustov Oct 7, 2019

Choose a reason for hiding this comment

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

1 Revert this change.
2 Merge master into your branch. getInjectedVar was temporarily exposed from the new platform in #47319 Later we will provide a substitution in #41990

name: RouteName.SINGLE_SERVICE_MAP
}
);
}
Copy link
Member

Choose a reason for hiding this comment

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

Any reason '/services/:serviceName/service-map' is added unconditionally but these are not?

Copy link
Contributor Author

@smith smith Oct 7, 2019

Choose a reason for hiding this comment

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

That was actually a duplicate from resolving a merge conflict. Fixed in 4f4b094.


useEffect(() => {
if (cy) {
cy.on('zoom', event => {
Copy link
Member

Choose a reason for hiding this comment

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

Is this event listener removed again? (to avoid memory leaks)

Copy link
Contributor Author

@smith smith Oct 7, 2019

Choose a reason for hiding this comment

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

Thanks for catching this. I forgot to put it there. It's been added in 4f4b094.

Copy link
Member

Choose a reason for hiding this comment

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

I looked at that commit and I don't see anything related (it's reverting a mock change).
What I'd expect is the useEffect body to return a cleanup function that calls cy.off('zoom', handler) or something like it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry no it was 799b5e9.

smith added 3 commits October 7, 2019 09:25
Add service map tabs on the main APM screen and for individual services.

This is not yet hooked up to work with back-end data, so it always shows the same hard-coded graph.

This is experimental, so you must have x-pack.apm.serviceMapEnabled: true in your Kibana config for it to show up.

Also add "PSF" to the list of allowed licenses since a new dependency added uses this license (it's on the [green list](https://github.com/elastic/open-source/blob/master/elastic-product-policy.md#green-list).)

Fixes elastic#44890
Fixes elastic#44853
@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@smith
Copy link
Contributor Author

smith commented Oct 7, 2019

@restrry I reverted the change you commented on earlier.

@sqren I updated the things you mentioned.

Thanks!

@peterschretlen
Copy link
Contributor

Renovate changes look good, not sure about adding PSF to the license whitelist but relying on @peterschretlen to authorize

@spalger The PSF license is a pre-approved (green-list) license, so we are OK to add it to the whitelist.

@smith smith merged commit 726a84f into elastic:master Oct 8, 2019
@smith smith deleted the nls/44853/map branch October 8, 2019 14:54
smith added a commit to smith/kibana that referenced this pull request Oct 10, 2019
Add service map tabs on the main APM screen and for individual services.

This is not yet hooked up to work with back-end data, so it always shows the same hard-coded graph.

This is experimental, so you must have x-pack.apm.serviceMapEnabled: true in your Kibana config for it to show up.

Also add "PSF" to the list of allowed licenses since a new dependency added uses this license (it's on the [green list](https://github.com/elastic/open-source/blob/master/elastic-product-policy.md#green-list).)

Fixes elastic#44890
Fixes elastic#44853
smith added a commit that referenced this pull request Oct 10, 2019
Add service map tabs on the main APM screen and for individual services.

This is not yet hooked up to work with back-end data, so it always shows the same hard-coded graph.

This is experimental, so you must have x-pack.apm.serviceMapEnabled: true in your Kibana config for it to show up.

Also add "PSF" to the list of allowed licenses since a new dependency added uses this license (it's on the [green list](https://github.com/elastic/open-source/blob/master/elastic-product-policy.md#green-list).)

Fixes #44890
Fixes #44853
@ogupte ogupte self-assigned this Oct 22, 2019
@ogupte ogupte added the apm:test-plan-done Pull request that was successfully tested during the test plan label Oct 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
apm:test-plan-done Pull request that was successfully tested during the test plan release_note:skip Skip the PR/issue when compiling release notes v7.5.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[APM] Zoom functionality for Service Map [APM] Service map UI implementation (Part 1 - without interactions)
10 participants