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.

Sign up for GitHub

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

Jump to bottom

Specifying valid licenses for the Graph feature #55911

Merged
merged 7 commits into from
Feb 7, 2020
Merged

Specifying valid licenses for the Graph feature #55911

merged 7 commits into from
Feb 7, 2020

Conversation

kobelb
Copy link
Contributor

@kobelb kobelb commented Jan 24, 2020 •
edited
Loading

Resolves #54724

This PR adds a ignoreValidLicenses query-string parameter to the /api/features endpoint, which we use from within the spaces only UI capability tests to create a space which has all features disabled. The spaces only UI capability tests are running with a basic license, which doesn't work with Graph. The UI capabilities and the license checking are completely separate at this point in time. Long-term, we should figure out how to consolidate these mechanisms.

"Release Note: Resolves bug with the Graph feature being displayed in the Spaces and Role management screens when the license doesn't grant access to Graph"

@kobelb kobelb requested a review from a team January 24, 2020 21:08
@kobelb kobelb requested a review from a team as a code owner January 24, 2020 21:08
@kobelb
Adding option to /api/features to ignore valid licenses
1014777 
This allow us to take advantage of the /api/featues endpoint within our
tests to disable all features, including those which are disabled by the
current license. The ui capabilities don't take into considerating the
license at the moment, so they're separate entirely separeate mechanisms
at this point in time.
pgayvallet
pgayvallet approved these changes Jan 27, 2020
View reviewed changes
x-pack/plugins/features/server/routes/index.ts Outdated Show resolved Hide resolved
x-pack/test/ui_capabilities/common/services/features.ts Outdated Show resolved Hide resolved
@kobelb
Copy link
Contributor Author

kobelb commented Feb 3, 2020

@elasticmachine merge upstream

@kobelb
Copy link
Contributor Author

kobelb commented Feb 4, 2020

@elasticmachine merge upstream

@kobelb
Copy link
Contributor Author

kobelb commented Feb 4, 2020

@elasticmachine merge upstream

@kobelb
Copy link
Contributor Author

kobelb commented Feb 6, 2020

@elasticmachine merge upstream

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

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

@elastic elastic deleted a comment from kibanamachine Feb 6, 2020
flash1293
flash1293 approved these changes Feb 7, 2020
View reviewed changes
Copy link
Contributor

@flash1293 flash1293 left a comment

Choose a reason for hiding this comment

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

Tested with trial license and works as expected. LGTM 👍

@kobelb kobelb merged commit 02f309c into elastic:master Feb 7, 2020
@kobelb kobelb deleted the fix/graph-valid-licenses branch February 7, 2020 18:28
@kobelb kobelb mentioned this pull request Feb 7, 2020
Merged
kobelb added a commit that referenced this pull request Feb 7, 2020
@kobelb @elasticmachine
Specifying valid licenses for the Graph feature (#55911) (#57140)
565829d 
* Specifying valid licenses for the Graph feature

* Adding option to /api/features to ignore valid licenses

This allow us to take advantage of the /api/featues endpoint within our
tests to disable all features, including those which are disabled by the
current license. The ui capabilities don't take into considerating the
license at the moment, so they're separate entirely separeate mechanisms
at this point in time.

* Addressing PR comments

Co-authored-by: Elastic Machine <[email protected]>

Co-authored-by: Elastic Machine <[email protected]>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Feb 9, 2020
@gmmorris
Merge remote-tracking branch 'upstream/master' into alerting/get-aler…
03c405f 
…t-state

* upstream/master: (96 commits)
  top nav ts arg support (elastic#56984)
  [SIEM][detection engine] Limit network rules to filebeat source semantics (elastic#57130)
  Add docs for alerting and action settings (elastic#57035)
  Add Test to Verify Endpoint App Landing Page (elastic#57129)
  Update `markdown-to-jsx` (`6.9.3` → `6.11.0`) and `url-parse` (`1.4.4` → `1.4.7`) dependencies. (elastic#57126)
  chore(NA): removes use of parallel option in the terser minimizer (elastic#57077)
  [ML] New Platform server shim: update file data visualizer routes to use new platform router (elastic#56972)
  Specifying valid licenses for the Graph feature (elastic#55911)
  [APM][docs] Add troubleshooting for non-indexed fields (elastic#54948)
  [ML] DF Analytics creation: update schema definition for create route (elastic#56979)
  Remove Kibana a11y guide in favor of EUI (elastic#57021)
  [Logs UI] Set streamLive false in URL state when arriving from link-to (elastic#56329)
  [docs] Fix spaces api example json (elastic#50411)
  Add new config for filebeat index name (elastic#56920)
  [Metrics-UI] Fix toolbar popover for metrics table row (elastic#56796)
  Saved Objects testing (elastic#56965)
  Disabled categorization stats validation (elastic#57087)
  [Rollups] Server NP migration (elastic#55606)
  [Metrics UI] Limit group by selector to only 2 fields (elastic#56800)
  fix auto closing new vis modal when navigating to lens or when navigating away with browser history (elastic#56998)
  ...
gmmorris added a commit to gmmorris/kibana that referenced this pull request Feb 9, 2020
@gmmorris
Merge branch 'master' into alerting/alert-instances
187589f 
* master: (96 commits)
  top nav ts arg support (elastic#56984)
  [SIEM][detection engine] Limit network rules to filebeat source semantics (elastic#57130)
  Add docs for alerting and action settings (elastic#57035)
  Add Test to Verify Endpoint App Landing Page (elastic#57129)
  Update `markdown-to-jsx` (`6.9.3` → `6.11.0`) and `url-parse` (`1.4.4` → `1.4.7`) dependencies. (elastic#57126)
  chore(NA): removes use of parallel option in the terser minimizer (elastic#57077)
  [ML] New Platform server shim: update file data visualizer routes to use new platform router (elastic#56972)
  Specifying valid licenses for the Graph feature (elastic#55911)
  [APM][docs] Add troubleshooting for non-indexed fields (elastic#54948)
  [ML] DF Analytics creation: update schema definition for create route (elastic#56979)
  Remove Kibana a11y guide in favor of EUI (elastic#57021)
  [Logs UI] Set streamLive false in URL state when arriving from link-to (elastic#56329)
  [docs] Fix spaces api example json (elastic#50411)
  Add new config for filebeat index name (elastic#56920)
  [Metrics-UI] Fix toolbar popover for metrics table row (elastic#56796)
  Saved Objects testing (elastic#56965)
  Disabled categorization stats validation (elastic#57087)
  [Rollups] Server NP migration (elastic#55606)
  [Metrics UI] Limit group by selector to only 2 fields (elastic#56800)
  fix auto closing new vis modal when navigating to lens or when navigating away with browser history (elastic#56998)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pgayvallet pgayvallet pgayvallet approved these changes

@flash1293 flash1293 flash1293 approved these changes

Assignees
No one assigned
Labels
release_note:fix v7.7.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Graph app not respecting license level for feature control visibility
4 participants
@kobelb @elasticmachine @flash1293 @pgayvallet