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] Service Map: Not Defined option doesn't work properly #77757

Merged

Conversation

cauemarcondes
Copy link
Contributor

@cauemarcondes cauemarcondes commented Sep 17, 2020

related to #77483

closes #77573

before:
opbeans-node/ruby/rum/dotnet don't have environment not defined, that's why the popover shows a message saying to change the selected env.
Screenshot 2020-09-29 at 13 47 57
Screenshot 2020-09-29 at 13 48 20

after:
Screenshot 2020-09-29 at 13 48 39

@cauemarcondes cauemarcondes added release_note:skip Skip the PR/issue when compiling release notes v7.10.0 labels Sep 17, 2020
@cauemarcondes cauemarcondes requested a review from a team as a code owner September 17, 2020 12:46
@botelastic botelastic bot added the Team:APM All issues that need APM UI Team support label Sep 17, 2020
@elasticmachine
Copy link
Contributor

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

@cauemarcondes
Copy link
Contributor Author

retest

Copy link
Member

@sorenlouv sorenlouv left a comment

Choose a reason for hiding this comment

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

I'm not seeing any updates to a test for getConnections. Do we not have any? Would be really good with a unit test (api test not necessary) to verify this behaviour.

@cauemarcondes
Copy link
Contributor Author

I'm not seeing any updates to a test for getConnections. Do we not have any? Would be really good with a unit test (api test not necessary) to verify this behaviour.

I've created an API test on my previous PR, it still works as expected even after the change, which is good =D... I can add a unit test if you want to!

@cauemarcondes
Copy link
Contributor Author

@elasticmachine merge upstream

@sorenlouv
Copy link
Member

sorenlouv commented Sep 21, 2020

I can add a unit test if you want to!

Yes, I think a unit test that verifies the different cases would be good.
The fact that this PR doesn't have any test changes indicates that we don't have adequate coverage.

@cauemarcondes
Copy link
Contributor Author

@elasticmachine merge upstream

Copy link
Member

@sorenlouv sorenlouv left a comment

Choose a reason for hiding this comment

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

lgtm 👍

Copy link
Member

@dgieselaar dgieselaar left a comment

Choose a reason for hiding this comment

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

As far as I can tell, we're not testing mixed environments which seems important. Same goes for connections to external destinations. Maybe I missed part of that conversation though.

@cauemarcondes
Copy link
Contributor Author

we're not testing mixed environments which seems important

What do you mean? The paths variable has two environments set production and testing

@dgieselaar
Copy link
Member

@cauemarcondes yes, but in different paths

Comment on lines +89 to +101
let { filter } = projection.body.query.bool;

if (options.serviceName) {
filter = filter.concat({
term: {
[SERVICE_NAME]: options.serviceName,
},
});
}

if (options.environment) {
filter = filter.concat(getEnvironmentUiFilterES(options.environment));
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@elastic/apm-ui this fixes the issue described here

Copy link
Member

@sorenlouv sorenlouv left a comment

Choose a reason for hiding this comment

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

Test are much easier to read now. Good work 👍

Copy link
Member

@dgieselaar dgieselaar left a comment

Choose a reason for hiding this comment

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

nice work @cauemarcondes 👍

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

distributable file count

id value diff baseline
default 45636 -1 45637

History

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

@cauemarcondes cauemarcondes merged commit 7b90333 into elastic:master Sep 30, 2020
@cauemarcondes cauemarcondes deleted the apm-servicemaps-env-not-defined branch September 30, 2020 10:36
cauemarcondes added a commit to cauemarcondes/kibana that referenced this pull request Sep 30, 2020
…c#77757)

* Service Map:  option doesn't work properly

* addressing PR comment

* addressing PR comment

* adding unit tests

* addressing PR comment

* fixing tests

* addressing PR comment

* addressing PR comment

* addressing PR comment

* addressing PR comment

* addressing PR comment

* add filter by environment

* addressing PR comment

* fixing API tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
yctercero pushed a commit to yctercero/kibana that referenced this pull request Sep 30, 2020
…c#77757)

* Service Map:  option doesn't work properly

* addressing PR comment

* addressing PR comment

* adding unit tests

* addressing PR comment

* fixing tests

* addressing PR comment

* addressing PR comment

* addressing PR comment

* addressing PR comment

* addressing PR comment

* add filter by environment

* addressing PR comment

* fixing API tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
phillipb added a commit to phillipb/kibana that referenced this pull request Sep 30, 2020
…aly-detection-partition-field

* 'master' of github.com:elastic/kibana: (37 commits)
  [UiActions] Don't throw an error if there are no compatible actions to execute (elastic#78917)
  [Observability] Kibana nav when docked overlaps the content of the pages. (elastic#78593)
  Invalid `searchSourceJSON` causes saved object migration to fail (elastic#78535)
  update vega version (elastic#78390)
  Fix warning text doesn't get displayed on filters with custom filter name (elastic#78617)
  [ILM] Data tier notices should reflect tier preferences (elastic#78398)
  [APM] Service Map: `Not Defined` option doesn't work properly (elastic#77757)
  Improve invalid field error message at search.aggs.param_types.field (elastic#78587)
  Remove isDeprecated flag on visType (elastic#78820)
  Remove unused elasticsearch.preserverHost setting (elastic#78608)
  Fix condition and adjust tests (elastic#78898)
  [UX] Add percentile selector (elastic#78562)
  [ML] Replace use of rest_total_hits_as_int with track_total_hits (elastic#78423)
  expression service docs (elastic#78774)
  [Functional] Wait for the page to load and then click the new vis button (elastic#78725)
  [TSVB] No data in visualizations with annotations (elastic#78794)
  [kbn/ui-shared-deps] track asset sizes (elastic#78718)
  delete target before building (elastic#78665)
  Move indexPattern.popularizeField into discover (elastic#77668)
  [Security Solution][Resolver]Add backdrop to pills (elastic#78625)
  ...
cauemarcondes added a commit to cauemarcondes/kibana that referenced this pull request Oct 1, 2020
…c#77757)

* Service Map:  option doesn't work properly

* addressing PR comment

* addressing PR comment

* adding unit tests

* addressing PR comment

* fixing tests

* addressing PR comment

* addressing PR comment

* addressing PR comment

* addressing PR comment

* addressing PR comment

* add filter by environment

* addressing PR comment

* fixing API tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
cauemarcondes added a commit that referenced this pull request Oct 1, 2020
…77757) | fixing api test (#78964) (#79063)

* [APM] Service Map: `Not Defined` option doesn't work properly (#77757)

* Service Map:  option doesn't work properly

* addressing PR comment

* addressing PR comment

* adding unit tests

* addressing PR comment

* fixing tests

* addressing PR comment

* addressing PR comment

* addressing PR comment

* addressing PR comment

* addressing PR comment

* add filter by environment

* addressing PR comment

* fixing API tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

* fixing api test (#78964)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@ogupte ogupte self-assigned this Oct 20, 2020
@ogupte ogupte added the apm:test-plan-done Pull request that was successfully tested during the test plan label Oct 22, 2020
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 Team:APM All issues that need APM UI Team support v7.10.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[APM] Service map not scoping to selected environment
6 participants