[Maps] Surface on prem EMS#85729
Merged
thomasneirynck merged 17 commits intoelastic:masterfrom Dec 14, 2020
Merged
Conversation
nickpeihl
reviewed
Dec 14, 2020
Contributor
nickpeihl
left a comment
There was a problem hiding this comment.
lgtm so far! just a few nits and a question.
x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx
Outdated
Show resolved
Hide resolved
x-pack/plugins/maps/public/components/ems_unavailable_message.tsx
Outdated
Show resolved
Hide resolved
x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.js
Outdated
Show resolved
Hide resolved
x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.js
Outdated
Show resolved
Hide resolved
x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.js
Outdated
Show resolved
Hide resolved
nickpeihl
approved these changes
Dec 14, 2020
Contributor
nickpeihl
left a comment
There was a problem hiding this comment.
changes lgtm! thanks.
does this still need to be a draft PR?
Contributor
|
Pinging @elastic/kibana-gis (Team:Geo) |
Contributor
💚 Build SucceededMetrics [docs]Async chunks
Distributable file count
Page load bundle
History
To update your PR or re-run it, just comment with: |
thomasneirynck
added a commit
to thomasneirynck/kibana
that referenced
this pull request
Dec 14, 2020
gmmorris
added a commit
to ymao1/kibana
that referenced
this pull request
Dec 15, 2020
* master: (66 commits) [Alerting] fixes broken Alerting Example plugin (elastic#85774) [APM] Service overview instances table (elastic#85770) [Security Solution] Unskip timeline creation Cypress test (elastic#85871) properly recognize enterprise licenses (elastic#85849) [SecuritySolution][Detections] Adds SavedObject persistence to Signals Migrations (elastic#85690) [TSVB] Fix functional tests flakiness and unskip them (elastic#85388) [Fleet] Change permissions for Fleet enroll role (elastic#85802) Gauge visualization can no longer be clicked to filter on values since Kibana 7.10.0 (elastic#84768) [Security Solution][Detections] Add alert source to detection rule action context (elastic#85488) [Discover] Don't display hide/show button for histogram when there's no time filter (elastic#85424) skip flaky suite (elastic#78553) License checks for alerts plugin (elastic#85649) skip flaky suite (elastic#84992) skip 'query return results valid for scripted field' elastic#78553 Allow action types to perform their own mustache variable escaping in parameter templates (elastic#83919) [ML] More machine learning links in doc_links_service.ts (elastic#85365) Removed Alerting & Event Log deprecated fields that should not be using (elastic#85652) Closes elastic#79995 by adding new tab in transaction details to show related trace logs. (elastic#85859) Fix outdated jest snapshot [Maps] Surface on prem EMS (elastic#85729) ...
nreese
pushed a commit
that referenced
this pull request
Dec 15, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Closes #80866
This PR makes following changes to current behavior:
includeElasticMapsServiceis set tofalse. Previously, it would also be off if on-prem was configured but there was no enterprise license. Now the card is always shown but will appear disabled if the enterprise license is not available for on-prem configurationsElastic Maps ServicetoElastic Map Serverwhen on-prem is configuredemsUrlin description and error messagesemsUrlis set, check for enterprise-license and indicate in error-message of layer wizardChecklist
Delete any items that are not applicable to this PR.
For maintainers