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

[2.16] Fix minor issues for Direct Query Datasource #7419

Merged
merged 15 commits into from
Jul 24, 2024

Conversation

RyanL1997
Copy link
Contributor

@RyanL1997 RyanL1997 commented Jul 23, 2024

This PR will be forwardported into both main and 2.x

Description

[2.16] Fix minor issues for Direct Query Datasource

Issues Resolved

  • tabs order change
  • support deletion in mds
  • add acceleration creation flow into data connection table actions
  • mute the integration access when mds is enabled or no observability plugin and add the integration creation flow
  • add discover forwarding in data connection table
  • mute the log explore forwarding when observability dashboards is not installed
  • add log explore forwarding for s3 connections' action

Screenshot

Testing the changes

Changelog

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

Copy link
Contributor

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

Copy link

codecov bot commented Jul 23, 2024

Codecov Report

Attention: Patch coverage is 42.85714% with 24 lines in your changes missing coverage. Please review.

Project coverage is 67.85%. Comparing base (587b319) to head (ca34f2b).
Report is 1 commits behind head on 2.16.

Files Patch % Lines
...ion/manage_direct_query_data_connections_table.tsx 26.66% 20 Missing and 2 partials ⚠️
.../data_source_management/public/components/utils.ts 77.77% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             2.16    #7419      +/-   ##
==========================================
- Coverage   67.87%   67.85%   -0.02%     
==========================================
  Files        3589     3589              
  Lines       72327    72354      +27     
  Branches    11838    11844       +6     
==========================================
+ Hits        49091    49095       +4     
- Misses      20245    20265      +20     
- Partials     2991     2994       +3     
Flag Coverage Δ
Linux_1 33.49% <ø> (-0.01%) ⬇️
Linux_2 55.66% <ø> (ø)
Linux_3 44.44% <42.85%> (-0.02%) ⬇️
Linux_4 34.19% <11.11%> (-0.01%) ⬇️
Windows_1 33.51% <ø> (-0.01%) ⬇️
Windows_2 55.61% <ø> (ø)
Windows_3 44.46% <42.85%> (-0.02%) ⬇️
Windows_4 34.19% <11.11%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

5 similar comments
Copy link
Contributor

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

Copy link
Contributor

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

Copy link
Contributor

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

Copy link
Contributor

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

Copy link
Contributor

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

Copy link
Contributor

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

2 similar comments
Copy link
Contributor

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

Copy link
Contributor

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

@ruanyl ruanyl added the v2.16.0 label Jul 24, 2024
@RyanL1997
Copy link
Contributor Author

RyanL1997 commented Jul 24, 2024

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: Ryan Liang <jiallian@amazon.com>
ruanyl
ruanyl previously approved these changes Jul 24, 2024
Signed-off-by: Ryan Liang <jiallian@amazon.com>
@BionIT BionIT merged commit 289a7c0 into opensearch-project:2.16 Jul 24, 2024
63 of 65 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to main failed:

The process '/usr/bin/git' failed with exit code 128

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-main main
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-main
# Create a new branch
git switch --create backport/backport-7419-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 289a7c0c1a1f0b4eec0d1b9608ff4f9c7f77c6b8
# Push it to GitHub
git push --set-upstream origin backport/backport-7419-to-main
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-main

Then, create a pull request where the base branch is main and the compare/head branch is backport/backport-7419-to-main.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

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-7419-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 289a7c0c1a1f0b4eec0d1b9608ff4f9c7f77c6b8
# Push it to GitHub
git push --set-upstream origin backport/backport-7419-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 base branch is 2.x and the compare/head branch is backport/backport-7419-to-2.x.

@RyanL1997
Copy link
Contributor Author

I will manual create the forward-port

RyanL1997 added a commit to RyanL1997/OpenSearch-Dashboards that referenced this pull request Jul 24, 2024
…ct#7419)

* Switch the tab orders

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add delete with MDS support

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add acc creation action in data connection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix snapshots

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* mute the table row for integration action when feature flag is disabled and no obs installed

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* add integration flyout in dataconnection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add discover forwarding action in connections table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Disable query in observability logs in data connections table action menu

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Update the test of connection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Update the test of home panel

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix the then for checking observability dashboards

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix delete

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin 2

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin 3 test

Signed-off-by: Ryan Liang <jiallian@amazon.com>

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>
ananzh added a commit to ananzh/OpenSearch-Dashboards that referenced this pull request Jul 24, 2024
ashwin-pc added a commit that referenced this pull request Jul 25, 2024
… (#7461)

* [2.16] Fix minor issues for Direct Query Datasource (#7419)

* Switch the tab orders

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add delete with MDS support

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add acc creation action in data connection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix snapshots

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* mute the table row for integration action when feature flag is disabled and no obs installed

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* add integration flyout in dataconnection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add discover forwarding action in connections table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Disable query in observability logs in data connections table action menu

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Update the test of connection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Update the test of home panel

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix the then for checking observability dashboards

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix delete

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin 2

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin 3 test

Signed-off-by: Ryan Liang <jiallian@amazon.com>

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix integration version

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix access control tab fetching for remote cluster (#7456)

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix snapshots

Signed-off-by: Ryan Liang <jiallian@amazon.com>

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Co-authored-by: Lu Yu <nluyu@amazon.com>
Co-authored-by: Ashwin P Chandran <ashwinpc@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 25, 2024
… (#7461)

* [2.16] Fix minor issues for Direct Query Datasource (#7419)

* Switch the tab orders

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add delete with MDS support

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add acc creation action in data connection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix snapshots

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* mute the table row for integration action when feature flag is disabled and no obs installed

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* add integration flyout in dataconnection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add discover forwarding action in connections table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Disable query in observability logs in data connections table action menu

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Update the test of connection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Update the test of home panel

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix the then for checking observability dashboards

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix delete

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin 2

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin 3 test

Signed-off-by: Ryan Liang <jiallian@amazon.com>

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix integration version

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix access control tab fetching for remote cluster (#7456)

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix snapshots

Signed-off-by: Ryan Liang <jiallian@amazon.com>

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Co-authored-by: Lu Yu <nluyu@amazon.com>
Co-authored-by: Ashwin P Chandran <ashwinpc@amazon.com>
(cherry picked from commit 6db84ea)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 25, 2024
… (#7461)

* [2.16] Fix minor issues for Direct Query Datasource (#7419)

* Switch the tab orders

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add delete with MDS support

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add acc creation action in data connection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix snapshots

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* mute the table row for integration action when feature flag is disabled and no obs installed

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* add integration flyout in dataconnection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add discover forwarding action in connections table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Disable query in observability logs in data connections table action menu

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Update the test of connection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Update the test of home panel

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix the then for checking observability dashboards

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix delete

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin 2

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin 3 test

Signed-off-by: Ryan Liang <jiallian@amazon.com>

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix integration version

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix access control tab fetching for remote cluster (#7456)

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix snapshots

Signed-off-by: Ryan Liang <jiallian@amazon.com>

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Co-authored-by: Lu Yu <nluyu@amazon.com>
Co-authored-by: Ashwin P Chandran <ashwinpc@amazon.com>
(cherry picked from commit 6db84ea)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ashwin-pc added a commit that referenced this pull request Jul 25, 2024
… (#7461) (#7491)

* [2.16] Fix minor issues for Direct Query Datasource (#7419)

* Switch the tab orders



* Add delete with MDS support



* Add acc creation action in data connection table



* Fix snapshots



* mute the table row for integration action when feature flag is disabled and no obs installed



* add integration flyout in dataconnection table



* Add discover forwarding action in connections table



* Disable query in observability logs in data connections table action menu



* Update the test of connection table



* Update the test of home panel



* Fix the then for checking observability dashboards



* Fix delete



* fix check plugin



* fix check plugin 2



* fix check plugin 3 test



---------



* Fix integration version



* Fix access control tab fetching for remote cluster (#7456)



* Fix snapshots



---------




(cherry picked from commit 6db84ea)

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Lu Yu <nluyu@amazon.com>
Co-authored-by: Ashwin P Chandran <ashwinpc@amazon.com>
BionIT added a commit that referenced this pull request Jul 25, 2024
… (#7461) (#7490)

* [2.16] Fix minor issues for Direct Query Datasource (#7419)

* Switch the tab orders



* Add delete with MDS support



* Add acc creation action in data connection table



* Fix snapshots



* mute the table row for integration action when feature flag is disabled and no obs installed



* add integration flyout in dataconnection table



* Add discover forwarding action in connections table



* Disable query in observability logs in data connections table action menu



* Update the test of connection table



* Update the test of home panel



* Fix the then for checking observability dashboards



* Fix delete



* fix check plugin



* fix check plugin 2



* fix check plugin 3 test



---------



* Fix integration version



* Fix access control tab fetching for remote cluster (#7456)



* Fix snapshots



---------




(cherry picked from commit 6db84ea)

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Lu Yu <nluyu@amazon.com>
Co-authored-by: Ashwin P Chandran <ashwinpc@amazon.com>
Qxisylolo pushed a commit to Qxisylolo/OpenSearch-Dashboards that referenced this pull request Aug 1, 2024
…search-project#7419) (opensearch-project#7461)

* [2.16] Fix minor issues for Direct Query Datasource (opensearch-project#7419)

* Switch the tab orders

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add delete with MDS support

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add acc creation action in data connection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix snapshots

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* mute the table row for integration action when feature flag is disabled and no obs installed

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* add integration flyout in dataconnection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Add discover forwarding action in connections table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Disable query in observability logs in data connections table action menu

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Update the test of connection table

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Update the test of home panel

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix the then for checking observability dashboards

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix delete

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin 2

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* fix check plugin 3 test

Signed-off-by: Ryan Liang <jiallian@amazon.com>

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix integration version

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix access control tab fetching for remote cluster (opensearch-project#7456)

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix snapshots

Signed-off-by: Ryan Liang <jiallian@amazon.com>

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Co-authored-by: Lu Yu <nluyu@amazon.com>
Co-authored-by: Ashwin P Chandran <ashwinpc@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants