Skip to content

[APM] Always load esarchives from common#77139

Merged
dgieselaar merged 2 commits intoelastic:masterfrom
dgieselaar:dedupe-esarchives
Sep 10, 2020
Merged

[APM] Always load esarchives from common#77139
dgieselaar merged 2 commits intoelastic:masterfrom
dgieselaar:dedupe-esarchives

Conversation

@dgieselaar
Copy link
Copy Markdown
Contributor

Instead of requiring every test suite to store its archives under {suite}/fixtures/es_archiver, always load them from common/fixtures/es_archiver.

Instead of requiring every test suite to store its archives under {suite}/fixtures/es_archiver, always load them from common/fixtures/es_archiver.
@dgieselaar dgieselaar added Team:APM - DEPRECATED Use Team:obs-ux-infra_services. release_note:skip Skip the PR/issue when compiling release notes v7.10.0 labels Sep 10, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

@cauemarcondes cauemarcondes left a comment

Choose a reason for hiding this comment

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

LGTM

@dgieselaar dgieselaar requested a review from a team September 10, 2020 09:18
@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

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

@dgieselaar dgieselaar merged commit 0f249d7 into elastic:master Sep 10, 2020
@dgieselaar dgieselaar deleted the dedupe-esarchives branch September 10, 2020 10:55
jloleysens added a commit to jloleysens/kibana that referenced this pull request Sep 10, 2020
…rok/new-patterns-component-use-array

* 'master' of github.com:elastic/kibana: (39 commits)
  [APM] Always load esarchives from common (elastic#77139)
  [Ingest Manager] Handle Legacy ES client errors (elastic#76865)
  [Docs] URL Drilldown (elastic#76529)
  [bugfix] Replace panel flyout opens 2 flyouts (elastic#76931)
  clean up test (elastic#76887)
  [Enterprise Search] Update shared API request handler (elastic#77112)
  [Maps] convert ESAggSource to TS (elastic#76999)
  Add plugin status API - take 2 (elastic#76732)
  Adds lens as a readable saved object for read-only dashboard users (elastic#77067)
  Skip checking for the reserved realm (elastic#76687)
  Reporting/diagnostics (elastic#74314)
  Reporting/Test: unskip non-screenshot tests (elastic#77088)
  Move metrics to setup and add cgroup metrics (elastic#76730)
  [Enterprise Search] Add Overview landing page/plugin (elastic#76734)
  First pass. Change TS type. Update OpenAPI (elastic#76434)
  [CI] Balance xpack ci groups a bit (elastic#77068)
  [Security_solution][Detections] Refactor signal ancestry to allow multiple parents (elastic#76531)
  [Maps] convert MetricsEditor to TS (elastic#76727)
  IndexMigrator: fix non blocking migration wrapper promise rejection (elastic#77018)
  [Enterprise Search] Update config data endpoint to v2 (elastic#76970)
  ...

# Conflicts:
#	src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts
cauemarcondes pushed a commit to cauemarcondes/kibana that referenced this pull request Sep 13, 2020
# Conflicts:
#	x-pack/test/apm_api_integration/common/fixtures/es_archiver/ml_8.0.0/data.json.gz
#	x-pack/test/apm_api_integration/common/fixtures/es_archiver/ml_8.0.0/mappings.json
cauemarcondes added a commit that referenced this pull request Sep 13, 2020
# Conflicts:
#	x-pack/test/apm_api_integration/common/fixtures/es_archiver/ml_8.0.0/data.json.gz
#	x-pack/test/apm_api_integration/common/fixtures/es_archiver/ml_8.0.0/mappings.json

Co-authored-by: Dario Gieselaar <dario.gieselaar@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release_note:skip Skip the PR/issue when compiling release notes Team:APM - DEPRECATED Use Team:obs-ux-infra_services. v7.10.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants