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

[Maps] Use v7.6 Elastic Maps Service API #54399

Merged
merged 16 commits into from
Jan 14, 2020
Merged

Conversation

nickpeihl
Copy link
Member

@nickpeihl nickpeihl commented Jan 9, 2020

Summary

This PR updates Kibana to use the v7.6 Elastic Maps Service client and API. Relies on elastic/ems-client#13.

To test this:

EDIT: @elastic/ems-client library@7.6.0 is now published on NPM, so the following steps are unnecessary now.
1) Checkout the feature branch from elastic/ems-client#13
2) In the ems-client directory, run yarn, yarn build, and yarn link.
3) Checkout this feature branch in Kibana
4) Run yarn kbn bootstrap and yarn link @elastic/ems-client.

EDIT: These steps are no longer necessary, the 7.6 file service API is now available in staging.
The 7.6 file service API is not available yet. But we can run this locally.
1) Checkout the feature branch from elastic/ems-file-service#143
2) In the ems-file-service directory run yarn and yarn build.
3) Serve the assets locally npx http-server -p 8085 --cors="kbn-version" dist/vector
4) Add map.emsFileApiUrl: http://localhost:8085 to your kibana.dev.yml.

You should also test this with map.proxyElasticMapsServiceInMaps: true in your kibana.dev.yml.

Checklist

Use strikethroughs to remove checklist items you don't feel are applicable to this PR.

For maintainers

Dev Docs

Elastic Maps, Coordinate map and Region map visualizations

The undocumented map.manifestServiceUrl setting in kibana.yml has been replaced by map.emsTileApiUrl and map.emsFileApiUrl. These settings configure the base URL for the tile basemap manifest and vector file manifests used in Elastic Maps and the region map and coordinate map.visualizations.

@nickpeihl nickpeihl requested a review from jsanz January 10, 2020 17:56
Copy link
Contributor

@thomasneirynck thomasneirynck left a comment

Choose a reason for hiding this comment

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

package.json and xpack/package.json needs to be updated to emc-client 7.6.0 thx!

x-pack/legacy/plugins/maps/server/routes.js Show resolved Hide resolved
x-pack/legacy/plugins/maps/server/routes.js Show resolved Hide resolved
@nickpeihl nickpeihl marked this pull request as ready for review January 13, 2020 21:40
@nickpeihl nickpeihl requested review from a team as code owners January 13, 2020 21:40
@nickpeihl nickpeihl added release_note:skip Skip the PR/issue when compiling release notes v7.6.0 v8.0.0 labels Jan 13, 2020
@nickpeihl
Copy link
Member Author

@elasticmachine merge upstream

package.json Outdated Show resolved Hide resolved
src/legacy/server/config/schema.js Show resolved Hide resolved
x-pack/legacy/plugins/maps/server/routes.js Outdated Show resolved Hide resolved
x-pack/package.json Outdated Show resolved Hide resolved
Copy link
Contributor

@thomasneirynck thomasneirynck left a comment

Choose a reason for hiding this comment

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

oops, I approved by mistake 🎊 sorry. Some minor comments. Overall, looks great. But need a double-take if the proxy-config work, and I would lock in versions.

Let's also ensure with @gchaps that we have a corresponding release note for this.

@gchaps
Copy link
Contributor

gchaps commented Jan 14, 2020

@thomasneirynck @nickpeihl For this PR to be included in the Release Notes, replace the label release_note:skip with release_note:fix or release_note:enhancement. Also, add a label for the area: Team:Geo.

@nickpeihl nickpeihl added the [Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation label Jan 14, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-gis (Team:Geo)

@nickpeihl nickpeihl removed the release_note:skip Skip the PR/issue when compiling release notes label Jan 14, 2020
@nickpeihl
Copy link
Member Author

@elasticmachine merge upstream

@thomasneirynck thomasneirynck self-requested a review January 14, 2020 16:47
@nickpeihl nickpeihl added release_note:deprecation release_note:plugin_api_changes Contains a Plugin API changes section for the breaking plugin API changes section. labels Jan 14, 2020
@nickpeihl nickpeihl requested review from joshdover and pgayvallet and removed request for jsanz January 14, 2020 17:58
Copy link
Contributor

@thomasneirynck thomasneirynck left a comment

Choose a reason for hiding this comment

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

just minor feedback on the error message. I tested this through proxying and the normal setup.

Can you create a blocker ticket for updating the config to the production URL for files and the landing page, so we don't forget? Thanks!

src/core/server/config/deprecation/core_deprecations.ts Outdated Show resolved Hide resolved
x-pack/legacy/plugins/maps/server/routes.js Show resolved Hide resolved
@nickpeihl
Copy link
Member Author

nickpeihl commented Jan 14, 2020

Can you create a blocker ticket for updating the config to the production URL for files and the landing page, so we don't forget? Thanks!

#54829 and #54830

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

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

@nickpeihl nickpeihl removed the request for review from pgayvallet January 14, 2020 23:09
@nickpeihl nickpeihl merged commit 6c9e4ec into elastic:master Jan 14, 2020
nickpeihl added a commit to nickpeihl/kibana that referenced this pull request Jan 14, 2020
nickpeihl added a commit that referenced this pull request Jan 15, 2020
* Use v7.6 Elastic Maps Service API

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jan 15, 2020
* upstream/master: (72 commits)
  [ML] Calculate model memory limit API integration tests (elastic#54557)
  Skip flakey index template component integration tests. (elastic#54878)
  Add label and icon to nested fields in the doc table (elastic#54199)
  Reverse dependency of home plugin and apm/ml/cloud (elastic#52883)
  [SIEM][Detection Engine] Order JSON keys, fix scripts, update pre-packaged rules
  update invalid snapshot
  add readme note about alerting / manage_api_key cluster privilege (elastic#54639)
  [SIEM] New Overview Page (elastic#54783)
  [Uptime] Feature/refactor context initialization (elastic#54494)
  Upgrade EUI to v18.2.0 (elastic#54786)
  [SIEM] [Detection engine] from signals to timeline (elastic#54769)
  [Index Management] Add Mappings Editor to Index Template Wizard (elastic#47562)
  [SIEM][Detection Engine] Removes deprecated filter from mapping
  [Maps] Add categorical styling (elastic#54408)
  Add mapbox-gl-rtl-text library (elastic#54842)
  [SIEM][Detection Engine] Adds actions to Rule Details (elastic#54828)
  Lexicographically sort location tags (elastic#54832)
  [Maps] expand extent filter to tile boundaries (elastic#54276)
  [Maps] Use v7.6 Elastic Maps Service API (elastic#54399)
  [DOCS] Adds monitoring setting (elastic#54819)
  ...
jkelastic pushed a commit to jkelastic/kibana that referenced this pull request Jan 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation release_note:deprecation release_note:plugin_api_changes Contains a Plugin API changes section for the breaking plugin API changes section. v7.6.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants