Skip to content

properly recognize enterprise licenses#85849

Merged
pgayvallet merged 1 commit intoelastic:masterfrom
pgayvallet:kbn-xxx-enterprise-license
Dec 15, 2020
Merged

properly recognize enterprise licenses#85849
pgayvallet merged 1 commit intoelastic:masterfrom
pgayvallet:kbn-xxx-enterprise-license

Conversation

@pgayvallet
Copy link
Copy Markdown
Contributor

Summary

Adds accept_enterprise=true when calling /_xpack to fetch the license from ES, to avoid converting enterprise level licenses to platinum.

This was working at some point, then got broke by elastic/elasticsearch#58217.

Checklist

Release note

Fix a bug causing an enterprise level license to be seen as a platinum level one.

@pgayvallet pgayvallet added Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// release_note:fix v7.11.0 v7.10.2 labels Dec 14, 2020
@pgayvallet pgayvallet requested a review from a team as a code owner December 14, 2020 20:11
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-core (Team:Core)

Comment on lines +79 to +80
// expires 2022-12-31
expiry_date_in_millis: 1672531199999,
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

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?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙈 We can schedule a slackbot reminder for 2022-12-01?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We can store it in a separate file to import in a script to run validation. Not a blocker for the current PR.

@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Metrics [docs]

Distributable file count

id before after diff
default 47132 47892 +760

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

Comment on lines +79 to +80
// expires 2022-12-31
expiry_date_in_millis: 1672531199999,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙈 We can schedule a slackbot reminder for 2022-12-01?

await testSubjects.missingOrFail('licenseExpiredBanner');
});

it('properly recognize an enterprise license', async () => {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

the file affects the environment already, so it's fine

@pgayvallet pgayvallet merged commit bd7e709 into elastic:master 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)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release_note:fix Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// v7.10.2 v7.11.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants