properly recognize enterprise licenses #85849
Merged
Conversation
This file contains 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
pgayvallet
added
Team:Core
|
Pinging @elastic/kibana-core (Team:Core) |
pgayvallet
commented
Dec 14, 2020
Comment on lines
+79
to
+80
| // expires 2022-12-31 | ||
| expiry_date_in_millis: 1672531199999, |
There was a problem hiding this comment.
The test will break in 2 years, but we don't have any dev license with a longer lifespan. Should I create an issue or write this down somewhere?
There was a problem hiding this comment.
🙈 We can schedule a slackbot reminder for 2022-12-01?
There was a problem hiding this comment.
We can store it in a separate file to import in a script to run validation. Not a blocker for the current PR.
joshdover
approved these changes
Dec 14, 2020
Comment on lines
+79
to
+80
| // expires 2022-12-31 | ||
| expiry_date_in_millis: 1672531199999, |
There was a problem hiding this comment.
🙈 We can schedule a slackbot reminder for 2022-12-01?
mshustov
reviewed
Dec 15, 2020
| @@ -62,5 +62,13 @@ export default function (ftrContext: FtrProviderContext) { | |||
| // banner shown only when license expired not just deleted | |||
| await testSubjects.missingOrFail('licenseExpiredBanner'); | |||
| }); | |||
|
|
|||
| it('properly recognize an enterprise license', async () => { | |||
There was a problem hiding this comment.
the file affects the environment already, so it's fine
mshustov
approved these changes
Dec 15, 2020
pgayvallet
added a commit
to pgayvallet/kibana
that referenced
this pull request
Dec 15, 2020
pgayvallet
added a commit
to pgayvallet/kibana
that referenced
this pull request
Dec 15, 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) ...
pgayvallet
added a commit
that referenced
this pull request
Dec 15, 2020
pgayvallet
added a commit
that referenced
this pull request
Dec 15, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Adds
accept_enterprise=truewhen calling/_xpackto fetch the license from ES, to avoid convertingenterpriselevel licenses toplatinum.This was working at some point, then got broke by elastic/elasticsearch#58217.
Checklist
Release note
Fix a bug causing an
enterpriselevel license to be seen as aplatinumlevel one.