-
Notifications
You must be signed in to change notification settings - Fork 919
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
[discover-2.0] update interfaces and services for query, data, languages #7731
Conversation
ℹ️ Manual Changeset Creation ReminderPlease ensure manual commit for changeset file 7731.yml under folder changelogs/fragments to complete this PR. If you want to use the available OpenSearch Changeset Bot App to avoid manual creation of changeset file you can install it in your forked repository following this link. For more information about formatting of changeset files, please visit OpenSearch Auto Changeset and Release Notes Tool. |
❌ Changeset File Not Added YetPlease ensure manual commit for changeset file 7731.yml under folder changelogs/fragments to complete this PR. File still missing. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #7731 +/- ##
==========================================
+ Coverage 63.86% 64.16% +0.30%
==========================================
Files 3665 3659 -6
Lines 81441 80796 -645
Branches 12994 12866 -128
==========================================
- Hits 52010 51846 -164
+ Misses 26243 25770 -473
+ Partials 3188 3180 -8
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
04b4784
to
21604e8
Compare
The merge-base changed after approval.
I dont know why github seems to be dismissing this PR approvals. It's actually really annoying. I'm not pushing any changes and I'm not dismissing any of the reviews. |
Signed-off-by: Kawika Avilla <[email protected]>
* Move dataset location Signed-off-by: Kawika Avilla <[email protected]> * update interfaces Signed-off-by: Kawika Avilla <[email protected]> * Update src/plugins/data/common/datasets/types.ts Co-authored-by: Ashwin P Chandran <[email protected]> Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]>
Signed-off-by: abbyhu2000 <[email protected]>
* dataset handler and move manager Signed-off-by: Kawika Avilla <[email protected]> * Adds new Data selector Signed-off-by: Ashwin P Chandran <[email protected]> fixes loading state Signed-off-by: Ashwin P Chandran <[email protected]> * start wiring into the selector Signed-off-by: Kawika Avilla <[email protected]> no more white screen Signed-off-by: Kawika Avilla <[email protected]> updating handler Signed-off-by: Kawika Avilla <[email protected]> rendering data Signed-off-by: Kawika Avilla <[email protected]> data structures working ok Signed-off-by: Kawika Avilla <[email protected]> need to add datasets Signed-off-by: Kawika Avilla <[email protected]> clean up Signed-off-by: Kawika Avilla <[email protected]> deleted unneeded types Signed-off-by: Kawika Avilla <[email protected]> * still working on the data structure and field Signed-off-by: Kawika Avilla <[email protected]> * still not working. the leaf logic isnt right i believe Signed-off-by: Kawika Avilla <[email protected]> * indices Signed-off-by: Kawika Avilla <[email protected]> * pushing datasets Signed-off-by: Kawika Avilla <[email protected]> * fix index pattern Signed-off-by: Kawika Avilla <[email protected]> * fixes with column Signed-off-by: Kawika Avilla <[email protected]> * working creation step Signed-off-by: Kawika Avilla <[email protected]> * get dataset from state in use index pattern Signed-off-by: Kawika Avilla <[email protected]> * dataset selector working Signed-off-by: Kawika Avilla <[email protected]> * update ppl interceptor Signed-off-by: Kawika Avilla <[email protected]> * add dataset service Signed-off-by: Kawika Avilla <[email protected]> * language service Signed-off-by: Kawika Avilla <[email protected]> * wired up but the dataset is off Signed-off-by: Kawika Avilla <[email protected]> * Address review comments Signed-off-by: Kawika Avilla <[email protected]> * ppl query Signed-off-by: Kawika Avilla <[email protected]> * dql and lucene working again Signed-off-by: Kawika Avilla <[email protected]> * fix issue that would deselect dataset Signed-off-by: Kawika Avilla <[email protected]> * language switches and sets the query correctly Signed-off-by: Kawika Avilla <[email protected]> * upating query Signed-off-by: Kawika Avilla <[email protected]> * fix the styling a little Signed-off-by: Kawika Avilla <[email protected]> * little bit width Signed-off-by: Kawika Avilla <[email protected]> * submit on update Signed-off-by: Kawika Avilla <[email protected]> * fix sql Signed-off-by: Kawika Avilla <[email protected]> * ppl working better Signed-off-by: Kawika Avilla <[email protected]> * need to still fix the aggregations Signed-off-by: Kawika Avilla <[email protected]> * gotta fix the aggs and still need to update dql lucene dataset Signed-off-by: Kawika Avilla <[email protected]> * use patch Signed-off-by: Kawika Avilla <[email protected]> * Metadata slice Signed-off-by: Kawika Avilla <[email protected]> * index pattern updates Signed-off-by: Kawika Avilla <[email protected]> * types and datasource prepend Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Signed-off-by: Ashwin P Chandran <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]>
* progress Signed-off-by: abbyhu2000 <[email protected]> * get rid of setting class Signed-off-by: abbyhu2000 <[email protected]> * register editor inside language Signed-off-by: abbyhu2000 <[email protected]> * address commits Signed-off-by: abbyhu2000 <[email protected]> * address more comments Signed-off-by: abbyhu2000 <[email protected]> * change editor Signed-off-by: abbyhu2000 <[email protected]> --------- Signed-off-by: abbyhu2000 <[email protected]>
Signed-off-by: Ashwin P Chandran <[email protected]>
* update manager Signed-off-by: Kawika Avilla <[email protected]> * Extension passing Signed-off-by: Kawika Avilla <[email protected]> * mock getIndexPatterns Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]>
Signed-off-by: Kawika Avilla <[email protected]>
* Fix Nav Bar layout in New Discover Signed-off-by: Suchit Sahoo <[email protected]> * Changeset file for PR #7853 created/updated --------- Signed-off-by: Suchit Sahoo <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
* Updating mocks still Signed-off-by: Kawika Avilla <[email protected]> * Keep fixing mocks Signed-off-by: Kawika Avilla <[email protected]> * update to not use getter Signed-off-by: Kawika Avilla <[email protected]> * fix the query being updated twice Signed-off-by: Kawika Avilla <[email protected]> * update snapshot Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]>
Signed-off-by: Kawika Avilla <[email protected]>
Signed-off-by: Kawika Avilla <[email protected]>
Signed-off-by: Kawika Avilla <[email protected]>
c40dcab
to
caf949c
Compare
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-7731-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1976ecfd223bb8cb2462b2779d1b7af97016c476
# Push it to GitHub
git push --set-upstream origin backport/backport-7731-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x Then, create a pull request where the |
…ges (opensearch-project#7731) * Initial updates to new interfaces Discover expects Signed-off-by: Kawika Avilla <[email protected]> * [discover] update interfaces and move dataset manager (opensearch-project#7745) * Move dataset location Signed-off-by: Kawika Avilla <[email protected]> * update interfaces Signed-off-by: Kawika Avilla <[email protected]> * Update src/plugins/data/common/datasets/types.ts Co-authored-by: Ashwin P Chandran <[email protected]> Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]> * fix rebase errors Signed-off-by: abbyhu2000 <[email protected]> * [discover] update interfaces and selector (opensearch-project#7835) * dataset handler and move manager Signed-off-by: Kawika Avilla <[email protected]> * Adds new Data selector Signed-off-by: Ashwin P Chandran <[email protected]> fixes loading state Signed-off-by: Ashwin P Chandran <[email protected]> * start wiring into the selector Signed-off-by: Kawika Avilla <[email protected]> no more white screen Signed-off-by: Kawika Avilla <[email protected]> updating handler Signed-off-by: Kawika Avilla <[email protected]> rendering data Signed-off-by: Kawika Avilla <[email protected]> data structures working ok Signed-off-by: Kawika Avilla <[email protected]> need to add datasets Signed-off-by: Kawika Avilla <[email protected]> clean up Signed-off-by: Kawika Avilla <[email protected]> deleted unneeded types Signed-off-by: Kawika Avilla <[email protected]> * still working on the data structure and field Signed-off-by: Kawika Avilla <[email protected]> * still not working. the leaf logic isnt right i believe Signed-off-by: Kawika Avilla <[email protected]> * indices Signed-off-by: Kawika Avilla <[email protected]> * pushing datasets Signed-off-by: Kawika Avilla <[email protected]> * fix index pattern Signed-off-by: Kawika Avilla <[email protected]> * fixes with column Signed-off-by: Kawika Avilla <[email protected]> * working creation step Signed-off-by: Kawika Avilla <[email protected]> * get dataset from state in use index pattern Signed-off-by: Kawika Avilla <[email protected]> * dataset selector working Signed-off-by: Kawika Avilla <[email protected]> * update ppl interceptor Signed-off-by: Kawika Avilla <[email protected]> * add dataset service Signed-off-by: Kawika Avilla <[email protected]> * language service Signed-off-by: Kawika Avilla <[email protected]> * wired up but the dataset is off Signed-off-by: Kawika Avilla <[email protected]> * Address review comments Signed-off-by: Kawika Avilla <[email protected]> * ppl query Signed-off-by: Kawika Avilla <[email protected]> * dql and lucene working again Signed-off-by: Kawika Avilla <[email protected]> * fix issue that would deselect dataset Signed-off-by: Kawika Avilla <[email protected]> * language switches and sets the query correctly Signed-off-by: Kawika Avilla <[email protected]> * upating query Signed-off-by: Kawika Avilla <[email protected]> * fix the styling a little Signed-off-by: Kawika Avilla <[email protected]> * little bit width Signed-off-by: Kawika Avilla <[email protected]> * submit on update Signed-off-by: Kawika Avilla <[email protected]> * fix sql Signed-off-by: Kawika Avilla <[email protected]> * ppl working better Signed-off-by: Kawika Avilla <[email protected]> * need to still fix the aggregations Signed-off-by: Kawika Avilla <[email protected]> * gotta fix the aggs and still need to update dql lucene dataset Signed-off-by: Kawika Avilla <[email protected]> * use patch Signed-off-by: Kawika Avilla <[email protected]> * Metadata slice Signed-off-by: Kawika Avilla <[email protected]> * index pattern updates Signed-off-by: Kawika Avilla <[email protected]> * types and datasource prepend Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Signed-off-by: Ashwin P Chandran <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]> * Use language service to render query editor (opensearch-project#7848) * progress Signed-off-by: abbyhu2000 <[email protected]> * get rid of setting class Signed-off-by: abbyhu2000 <[email protected]> * register editor inside language Signed-off-by: abbyhu2000 <[email protected]> * address commits Signed-off-by: abbyhu2000 <[email protected]> * address more comments Signed-off-by: abbyhu2000 <[email protected]> * change editor Signed-off-by: abbyhu2000 <[email protected]> --------- Signed-off-by: abbyhu2000 <[email protected]> * minor fixes (opensearch-project#7850) Signed-off-by: Ashwin P Chandran <[email protected]> * [discover] Updates to mocks for tests and ci (opensearch-project#7852) * update manager Signed-off-by: Kawika Avilla <[email protected]> * Extension passing Signed-off-by: Kawika Avilla <[email protected]> * mock getIndexPatterns Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> * include create and save Signed-off-by: Kawika Avilla <[email protected]> * Fix Nav Bar layout in New Discover (opensearch-project#7853) * Fix Nav Bar layout in New Discover Signed-off-by: Suchit Sahoo <[email protected]> * Changeset file for PR opensearch-project#7853 created/updated --------- Signed-off-by: Suchit Sahoo <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * [discover] keep fixing mocks (opensearch-project#7855) * Updating mocks still Signed-off-by: Kawika Avilla <[email protected]> * Keep fixing mocks Signed-off-by: Kawika Avilla <[email protected]> * update to not use getter Signed-off-by: Kawika Avilla <[email protected]> * fix the query being updated twice Signed-off-by: Kawika Avilla <[email protected]> * update snapshot Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> * fix remaining failures Signed-off-by: Kawika Avilla <[email protected]> * manual changelog Signed-off-by: Kawika Avilla <[email protected]> * update snapshot Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Signed-off-by: abbyhu2000 <[email protected]> Signed-off-by: Ashwin P Chandran <[email protected]> Signed-off-by: Suchit Sahoo <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]> Co-authored-by: abbyhu2000 <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]> Co-authored-by: Suchit Sahoo <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit 1976ecf)
…ges (#7731) (#7863) * Initial updates to new interfaces Discover expects Signed-off-by: Kawika Avilla <[email protected]> * [discover] update interfaces and move dataset manager (#7745) * Move dataset location Signed-off-by: Kawika Avilla <[email protected]> * update interfaces Signed-off-by: Kawika Avilla <[email protected]> * Update src/plugins/data/common/datasets/types.ts Co-authored-by: Ashwin P Chandran <[email protected]> Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]> * fix rebase errors Signed-off-by: abbyhu2000 <[email protected]> * [discover] update interfaces and selector (#7835) * dataset handler and move manager Signed-off-by: Kawika Avilla <[email protected]> * Adds new Data selector Signed-off-by: Ashwin P Chandran <[email protected]> fixes loading state Signed-off-by: Ashwin P Chandran <[email protected]> * start wiring into the selector Signed-off-by: Kawika Avilla <[email protected]> no more white screen Signed-off-by: Kawika Avilla <[email protected]> updating handler Signed-off-by: Kawika Avilla <[email protected]> rendering data Signed-off-by: Kawika Avilla <[email protected]> data structures working ok Signed-off-by: Kawika Avilla <[email protected]> need to add datasets Signed-off-by: Kawika Avilla <[email protected]> clean up Signed-off-by: Kawika Avilla <[email protected]> deleted unneeded types Signed-off-by: Kawika Avilla <[email protected]> * still working on the data structure and field Signed-off-by: Kawika Avilla <[email protected]> * still not working. the leaf logic isnt right i believe Signed-off-by: Kawika Avilla <[email protected]> * indices Signed-off-by: Kawika Avilla <[email protected]> * pushing datasets Signed-off-by: Kawika Avilla <[email protected]> * fix index pattern Signed-off-by: Kawika Avilla <[email protected]> * fixes with column Signed-off-by: Kawika Avilla <[email protected]> * working creation step Signed-off-by: Kawika Avilla <[email protected]> * get dataset from state in use index pattern Signed-off-by: Kawika Avilla <[email protected]> * dataset selector working Signed-off-by: Kawika Avilla <[email protected]> * update ppl interceptor Signed-off-by: Kawika Avilla <[email protected]> * add dataset service Signed-off-by: Kawika Avilla <[email protected]> * language service Signed-off-by: Kawika Avilla <[email protected]> * wired up but the dataset is off Signed-off-by: Kawika Avilla <[email protected]> * Address review comments Signed-off-by: Kawika Avilla <[email protected]> * ppl query Signed-off-by: Kawika Avilla <[email protected]> * dql and lucene working again Signed-off-by: Kawika Avilla <[email protected]> * fix issue that would deselect dataset Signed-off-by: Kawika Avilla <[email protected]> * language switches and sets the query correctly Signed-off-by: Kawika Avilla <[email protected]> * upating query Signed-off-by: Kawika Avilla <[email protected]> * fix the styling a little Signed-off-by: Kawika Avilla <[email protected]> * little bit width Signed-off-by: Kawika Avilla <[email protected]> * submit on update Signed-off-by: Kawika Avilla <[email protected]> * fix sql Signed-off-by: Kawika Avilla <[email protected]> * ppl working better Signed-off-by: Kawika Avilla <[email protected]> * need to still fix the aggregations Signed-off-by: Kawika Avilla <[email protected]> * gotta fix the aggs and still need to update dql lucene dataset Signed-off-by: Kawika Avilla <[email protected]> * use patch Signed-off-by: Kawika Avilla <[email protected]> * Metadata slice Signed-off-by: Kawika Avilla <[email protected]> * index pattern updates Signed-off-by: Kawika Avilla <[email protected]> * types and datasource prepend Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Signed-off-by: Ashwin P Chandran <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]> * Use language service to render query editor (#7848) * progress Signed-off-by: abbyhu2000 <[email protected]> * get rid of setting class Signed-off-by: abbyhu2000 <[email protected]> * register editor inside language Signed-off-by: abbyhu2000 <[email protected]> * address commits Signed-off-by: abbyhu2000 <[email protected]> * address more comments Signed-off-by: abbyhu2000 <[email protected]> * change editor Signed-off-by: abbyhu2000 <[email protected]> --------- Signed-off-by: abbyhu2000 <[email protected]> * minor fixes (#7850) Signed-off-by: Ashwin P Chandran <[email protected]> * [discover] Updates to mocks for tests and ci (#7852) * update manager Signed-off-by: Kawika Avilla <[email protected]> * Extension passing Signed-off-by: Kawika Avilla <[email protected]> * mock getIndexPatterns Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> * include create and save Signed-off-by: Kawika Avilla <[email protected]> * Fix Nav Bar layout in New Discover (#7853) * Fix Nav Bar layout in New Discover Signed-off-by: Suchit Sahoo <[email protected]> * Changeset file for PR #7853 created/updated --------- Signed-off-by: Suchit Sahoo <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * [discover] keep fixing mocks (#7855) * Updating mocks still Signed-off-by: Kawika Avilla <[email protected]> * Keep fixing mocks Signed-off-by: Kawika Avilla <[email protected]> * update to not use getter Signed-off-by: Kawika Avilla <[email protected]> * fix the query being updated twice Signed-off-by: Kawika Avilla <[email protected]> * update snapshot Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> * fix remaining failures Signed-off-by: Kawika Avilla <[email protected]> * manual changelog Signed-off-by: Kawika Avilla <[email protected]> * update snapshot Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Signed-off-by: abbyhu2000 <[email protected]> Signed-off-by: Ashwin P Chandran <[email protected]> Signed-off-by: Suchit Sahoo <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]> Co-authored-by: abbyhu2000 <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]> Co-authored-by: Suchit Sahoo <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit 1976ecf)
Manually backported with #7863 |
Description
This PR stabilizes the Multi-Query Language (MQL), and Multiple-Data-Sources (MDS) features by updating types to utilize a generic structure, abstracting data querying, and introducing a Language service. These changes aim to resolve conflicts in data source definitions across different projects and provide a flexible framework for handling various data structures.
Notes
This PR represents a significant step towards a more flexible and extensible multi-query language system in OpenSearch Dashboards.
Key Changes
Generic Data Structure: Introduced a flexible
DataStructure
interface that can represent various data hierarchies without hard-coding specific fields.Abstract Data Querying: Implemented a system where actual data querying is left to the project or developer to implement, allowing for diverse opinions and implementations.
Language Service: Added a Language service that registers more closely with the query object, improving the flow of queries through the application.
Consolidation: Cleaned up and consolidated existing code, resulting in a large PR despite individual commits being reviewed separately.
DataStructure Interface
The core of this update is the
DataStructure
interface:This interface allows for representation of various data hierarchies, such as OpenSearch clusters, indices, or even complex nested structures like S3 data sources.
Benefits
Improved Query Handling: The Language service allows for better integration of queries with different data structures.
Scope
Currently, these changes are only enabled for the Discover application. They lay the groundwork for potential future expansion to other parts of the system.
Screenshot
Testing the changes
local and CI
Changelog
Check List
yarn test:jest
yarn test:jest_integration