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] add on-prem EMS config #82525

Merged

Conversation

thomasneirynck
Copy link
Contributor

@thomasneirynck thomasneirynck commented Nov 3, 2020

Summary

Closes #80865

Add a new map.emsUrl setting to support on-prem version of EMS. When set,

Behavior in Maps:

  • the emsUrl setting will be applied regardless whether map.includeElasticMapsService is turned on or off
  • when this configuration is set, the cluster must be configured with a valid enterprise license
  • the paths to the individual resources need to be generated differently. Rules are outlined here: [Maps] Simplify EMS config for on-prem configs #80865 (comment)

Behavior in old legacy visualizations:

With basic:

  • these do not support on-prem deployment of EMS
  • when the emsUrl setting is set, the visualizations will not connect to the hosted version of EMS. It would be the same as setting map.includeElasticMapsService to false.

With OSS:

  • no changes. This setting should never be set. if so, it is invalid use.

Checklist

Delete any items that are not applicable to this PR.

For maintainers

@thomasneirynck thomasneirynck added chore release_note:skip Skip the PR/issue when compiling release notes [Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v7.11.0 v8.0.0 labels Nov 3, 2020
@thomasneirynck thomasneirynck marked this pull request as ready for review November 4, 2020 20:00
@elasticmachine
Copy link
Contributor

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

@thomasneirynck thomasneirynck requested a review from a team as a code owner November 5, 2020 18:00
@thomasneirynck
Copy link
Contributor Author

thomasneirynck commented Nov 6, 2020

If a user uploads a new license, the current implementation still requires a page-refresh. So I'll need to address that. But ready for initial review.

Copy link
Member

@jsanz jsanz left a comment

Choose a reason for hiding this comment

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

Tested locally on Chromium and Firefox, including upgrading and downgrading between different licenses and new and saved maps and behavior is consistent.

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id before after diff
maps 620 621 +1
mapsLegacy 186 188 +2
total +3

Async chunks

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

id before after diff
maps 2.8MB 2.8MB -186.0B
mapsLegacy 721.0KB 721.0KB +30.0B
total -156.0B

Distributable file count

id before after diff
default 42766 42769 +3
oss 22452 22454 +2

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id before after diff
maps 153.9KB 155.6KB +1.7KB
mapsLegacy 92.4KB 94.2KB +1.7KB
total +3.4KB

History

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

Copy link
Member

@nickpeihl nickpeihl left a comment

Choose a reason for hiding this comment

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

lgtm! tested legacy viz and Maps app with and without map.emsUrl setting. Also tested toggling proxyElasticMapsServiceInMaps and map.includeElasticMapsService.

Out of scope for this PR but we do need to add this setting to the documentation. But we can wait until we add documentation for running the on-prem service.

@thomasneirynck thomasneirynck merged commit e909cee into elastic:master Nov 10, 2020
thomasneirynck added a commit to thomasneirynck/kibana that referenced this pull request Nov 10, 2020
Adds.a new `map.emsUrl` setting. User can configure this to the location of a local on-prem installation of EMS. For this setting to take effect, the cluster must be configured with an enterprise license.
thomasneirynck added a commit that referenced this pull request Nov 10, 2020
Adds.a new `map.emsUrl` setting. User can configure this to the location of a local on-prem installation of EMS. For this setting to take effect, the cluster must be configured with an enterprise license.
phillipb added a commit to phillipb/kibana that referenced this pull request Nov 10, 2020
…kibana into bootstrap-node-details-overlay

* 'bootstrap-node-details-overlay' of github.com:phillipb/kibana: (49 commits)
  [Security Solution] Fix DNS Network table query (elastic#82778)
  [Workplace Search] Consolidate groups routes (elastic#83015)
  Adds cloud links to user menu (elastic#82803)
  [Security Solution][Detections] - follow up cleanup on auto refresh rules (elastic#83023)
  [App Search] Added the log retention panel to the Settings page (elastic#82982)
  [Maps] show icon when layer is filtered by time and allow layers to ignore global time range (elastic#83006)
  [DOCS] Consolidates drilldown pages (elastic#82081)
  [Maps] add on-prem EMS config (elastic#82525)
  migrate i18n mixin to KP (elastic#81799)
  [bundle optimization] fix imports of react-use lib (elastic#82847)
  [Discover] Add metric on adding filter (elastic#82961)
  [Lens] Performance refactoring for indexpattern fast lookup and Operation support matrix computation (elastic#82829)
  skip flaky suite (elastic#82804)
  Fix SO query for searching across spaces (elastic#83025)
  renaming built-in alerts to Stack Alerts (elastic#82873)
  [TSVB] Disable using top_hits in pipeline aggregations (elastic#82278)
  [Visualizations] Remove kui usage (elastic#82810)
  [Visualizations] Make the icon buttons labels more descriptive (elastic#82585)
  [Lens] Do not reset formatting when switching between custom ranges and auto histogram (elastic#82694)
  Fix ilm navigation (elastic#81664)
  ...
gmmorris added a commit to gmmorris/kibana that referenced this pull request Nov 10, 2020
…na into alerts/stack-alerts-public

* 'alerts/stack-alerts-public' of github.com:gmmorris/kibana:
  [Security Solution] Fix DNS Network table query (elastic#82778)
  [Workplace Search] Consolidate groups routes (elastic#83015)
  Adds cloud links to user menu (elastic#82803)
  [Security Solution][Detections] - follow up cleanup on auto refresh rules (elastic#83023)
  [App Search] Added the log retention panel to the Settings page (elastic#82982)
  [Maps] show icon when layer is filtered by time and allow layers to ignore global time range (elastic#83006)
  [DOCS] Consolidates drilldown pages (elastic#82081)
  [Maps] add on-prem EMS config (elastic#82525)
  migrate i18n mixin to KP (elastic#81799)
  [bundle optimization] fix imports of react-use lib (elastic#82847)
  [Discover] Add metric on adding filter (elastic#82961)
  [Lens] Performance refactoring for indexpattern fast lookup and Operation support matrix computation (elastic#82829)
  skip flaky suite (elastic#82804)
  Fix SO query for searching across spaces (elastic#83025)
  renaming built-in alerts to Stack Alerts (elastic#82873)
  [TSVB] Disable using top_hits in pipeline aggregations (elastic#82278)
  [Visualizations] Remove kui usage (elastic#82810)
  [Visualizations] Make the icon buttons labels more descriptive (elastic#82585)
  [Lens] Do not reset formatting when switching between custom ranges and auto histogram (elastic#82694)
:
@thomasneirynck thomasneirynck added release_note:enhancement and removed release_note:skip Skip the PR/issue when compiling release notes labels Feb 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Maps] Simplify EMS config for on-prem configs
5 participants