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

[License Management] NP migration #60250

Merged
merged 19 commits into from
Mar 18, 2020

Conversation

sebelga
Copy link
Contributor

@sebelga sebelga commented Mar 16, 2020

This PR migrates the License Management app to the new platform.

How to test

  • launch ES in trial mode yarn es snapshot --license trial
  • keep a clean copy to be able to retest quickly cp -aR .es/8.0.0 .es/8.0.0-clean
  • Launch Kibana
  • Navigate to the App
  • Click "Extend trial" and make sure we are directed to the correct URL to extend the trial
  • Go back to the app and click "Revert to Basic license". A modal should open. Click "Confirm"
  • The browser window should refresh, and once back on the app there should only be 2 options: "Update your license" and "Extend trial"
  • The "Cross cluster replication" app should not appear in the menu on the left
  • Click "Update your license" and drag & drop the platinum dev license
  • The browser window should refresh and you should see your active platinum license

Screenshot 2020-03-16 at 13 18 16

  • Delete the license through the API. In a terminal window run curl -XDELETE -v http://elastic:changeme@localhost:9200/_license
  • Manually refresh the Kibana browser window. You should see the Basic license back

Screenshot 2020-03-16 at 13 20 23

  • Stop Elasticsearch
  • Delete the instance rm -rf .es/8.0.0
  • Copy the clean instance cp -aR .es/8.0.0-clean .es/8.0.0/
  • Restart ES .es/8.0.0/bin/elasticsearch
  • Manually refresh the Kibana browser window. You should be back to the Trial license

Screenshot 2020-03-16 at 13 24 37

@sebelga sebelga requested a review from a team as a code owner March 16, 2020 12:25
@sebelga sebelga requested a review from jloleysens March 16, 2020 12:26
@sebelga sebelga added Feature:NP Migration release_note:skip Skip the PR/issue when compiling release notes Team:Kibana Management Dev Tools, Index Management, Upgrade Assistant, ILM, Ingest Node Pipelines, and more v7.7.0 v8.0.0 labels Mar 16, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/es-ui (Team:Elasticsearch UI)

@sebelga sebelga force-pushed the np-migration/license-management branch from 761e9fa to 1f118c1 Compare March 16, 2020 12:28
Copy link
Contributor

@cchaos cchaos left a comment

Choose a reason for hiding this comment

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

Can you also remove the import to the styling_constants in index.scss? When importing the SASS via the plugin JS, these are now automatically referenced.

Copy link
Contributor

@jloleysens jloleysens left a comment

Choose a reason for hiding this comment

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

@sebelga this work looks in great shape overall!

Had one question and one suggestion for a typo (on the code side). When testing I ran into a bug while following the steps to upload a (platinum) license:

Screenshot 2020-03-17 at 10 12 32

Would you mind taking a look?

docLinks: {},
};

const thunkServices = {
Copy link
Contributor

Choose a reason for hiding this comment

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

What is meant by thunkServices? When I think of thunk (lol) what comes to mind is: value -> () => value.

Copy link
Contributor

@jloleysens jloleysens Mar 17, 2020

Choose a reason for hiding this comment

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

Ah nvm, I see now what was meant by thunkServices further down (where the store is set up)

x-pack/plugins/license_management/server/types.ts Outdated Show resolved Hide resolved
@sebelga
Copy link
Contributor Author

sebelga commented Mar 17, 2020

Thanks for the review @cchaos and @jloleysens !
I removed the import of constants in the .scss file.

Good catch JL, this came from the last change on the server route path that I made to use an API_BASE_PATH. It has been fixed it. Do you mind having another look? Thanks!

@sebelga
Copy link
Contributor Author

sebelga commented Mar 17, 2020

@elasticmachine merge upstream

Copy link
Contributor

@cchaos cchaos left a comment

Choose a reason for hiding this comment

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

Found a typo, but SASS LGTM

@@ -1,6 +1,3 @@
// EUI globals
@import 'src/legacy/ui/public/styles/styling_constants';

// License amnagement plugin styles
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// License amnagement plugin styles
// License management plugin styles

Copy link
Contributor

@jloleysens jloleysens left a comment

Choose a reason for hiding this comment

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

Looks good after latest changes (did not test upload again)

@sebelga
Copy link
Contributor Author

sebelga commented Mar 17, 2020

@elasticmachine merge upstream

@sebelga
Copy link
Contributor Author

sebelga commented Mar 18, 2020

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

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

@sebelga sebelga merged commit 2a8a7d7 into elastic:master Mar 18, 2020
@sebelga sebelga deleted the np-migration/license-management branch March 18, 2020 12:36
gmmorris added a commit to gmmorris/kibana that referenced this pull request Mar 18, 2020
* master:
  [License Management] NP migration (elastic#60250)
  Fix create alert button from not showing in alerts list (elastic#60444)
  [SIEM][Case] Update connector through flyout (elastic#60307)
  add data-test-subj where possible on SO management table (elastic#60226)
  Enforce `required` presence for value/key validation of `recordOf` and `mapOf`. (elastic#60406)
jloleysens added a commit that referenced this pull request Mar 18, 2020
…nless

* 'app/painless' of github.com:elastic/kibana: (64 commits)
  Fix filter scope in bool query (#60488)
  change index pattern id to be the same as index pattern title (#60436)
  [Endpoint] resolver v1 events (#59233)
  Branding fixes for dashboard, loader and space selector (#60073)
  skip flaky suite (#60535)
  [SIEM][Detection Engine] Fixes bug with timeline templates not working
  Fixed errors which are happening if switch between alert types (#60453)
  [EPM] Add mapping field types to index template generation v2 (#60266)
  [NP] Cutover ensureDefaultIndexPattern to kibana_utils (#59895)
  Closes #60265. Adds Beta badge to service map (#60482)
  [Visualize] Duplicated query filters in es request (#60106)
  [ML] Disable functional transform tests
  Fixes to service map single node banner (#60072)
  [Uptime] replace fetch with kibana http (#59881)
  Upgrade @types/node to match Node.js runtime (#60368)
  [License Management] NP migration (#60250)
  Fix create alert button from not showing in alerts list (#60444)
  [SIEM][Case] Update connector through flyout (#60307)
  add data-test-subj where possible on SO management table (#60226)
  Enforce `required` presence for value/key validation of `recordOf` and `mapOf`. (#60406)
  ...
jloleysens added a commit to jloleysens/kibana that referenced this pull request Mar 19, 2020
* upstream/app/painless: (66 commits)
  Another i18n issue
  Fix i18n
  Fix filter scope in bool query (elastic#60488)
  change index pattern id to be the same as index pattern title (elastic#60436)
  [Endpoint] resolver v1 events (elastic#59233)
  Branding fixes for dashboard, loader and space selector (elastic#60073)
  skip flaky suite (elastic#60535)
  [SIEM][Detection Engine] Fixes bug with timeline templates not working
  Fixed errors which are happening if switch between alert types (elastic#60453)
  [EPM] Add mapping field types to index template generation v2 (elastic#60266)
  [NP] Cutover ensureDefaultIndexPattern to kibana_utils (elastic#59895)
  Closes elastic#60265. Adds Beta badge to service map (elastic#60482)
  [Visualize] Duplicated query filters in es request (elastic#60106)
  [ML] Disable functional transform tests
  Fixes to service map single node banner (elastic#60072)
  [Uptime] replace fetch with kibana http (elastic#59881)
  Upgrade @types/node to match Node.js runtime (elastic#60368)
  [License Management] NP migration (elastic#60250)
  Fix create alert button from not showing in alerts list (elastic#60444)
  [SIEM][Case] Update connector through flyout (elastic#60307)
  ...
gmmorris added a commit to gmmorris/kibana that referenced this pull request Mar 19, 2020
…alerting/tls-warning

* 'alerting/tls-warning' of github.com:gmmorris/kibana: (33 commits)
  [ML] Disable functional transform tests
  Fixes to service map single node banner (elastic#60072)
  [Uptime] replace fetch with kibana http (elastic#59881)
  Upgrade @types/node to match Node.js runtime (elastic#60368)
  [License Management] NP migration (elastic#60250)
  Fix create alert button from not showing in alerts list (elastic#60444)
  [SIEM][Case] Update connector through flyout (elastic#60307)
  add data-test-subj where possible on SO management table (elastic#60226)
  Enforce `required` presence for value/key validation of `recordOf` and `mapOf`. (elastic#60406)
  [ML] Re-enabling file upload telemetry (elastic#60418)
  [NP] Use local helper shortenDottedString for discover (elastic#60271)
  [Console] Fix for `_settings` and x-pack autocomplete (elastic#60246)
  Task/host enhancements (elastic#59671)
  [Search service] Asynchronous ES search strategy (elastic#53538)
  Index Action - Moved index params fields to connector config (elastic#60349)
  Edits UI text for ML nodes and job button (elastic#60184)
  Publish getIsNavDrawerLocked$ method on core chrome service. (elastic#60191)
  Disabled edit alert button on management ui for non registered UI alert types (elastic#60439)
  Revert "[Console] Fix bool filter autocompletions and refactor (elastic#60361)"
  [Console] Fix bool filter autocompletions and refactor (elastic#60361)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature:NP Migration release_note:skip Skip the PR/issue when compiling release notes Team:Kibana Management Dev Tools, Index Management, Upgrade Assistant, ILM, Ingest Node Pipelines, and more v7.7.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants