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

[Manual backport 2.x] [Discover-next] toggle enhancements #7408

Merged

Conversation

abbyhu2000
Copy link
Member

Description

Manual backport of #7314

Issues Resolved

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.

…ensearch-project#7291) (opensearch-project#7293)

* [Discover-next] remove plugin config toggle for data enhancements

Remove the data config toggle for enhancements and rely on the
UI settings for being enabled.

(cherry picked from commit 5761207)

Signed-off-by: Kawika Avilla <kavilla414@gmail.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: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
@abbyhu2000 abbyhu2000 force-pushed the backport/backport-7314-to-2.x branch from d1371af to 9224956 Compare July 23, 2024 17:29
Copy link

codecov bot commented Jul 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.71%. Comparing base (33d07a2) to head (959884a).

Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #7408      +/-   ##
==========================================
- Coverage   67.71%   67.71%   -0.01%     
==========================================
  Files        3584     3584              
  Lines       72249    72248       -1     
  Branches    11819    11818       -1     
==========================================
- Hits        48922    48920       -2     
- Misses      20356    20357       +1     
  Partials     2971     2971              
Flag Coverage Δ
Linux_1 33.18% <100.00%> (+<0.01%) ⬆️
Linux_2 55.66% <ø> (ø)
Linux_3 44.47% <100.00%> (+0.01%) ⬆️
Linux_4 34.20% <100.00%> (+<0.01%) ⬆️
Windows_1 33.20% <100.00%> (+<0.01%) ⬆️
Windows_2 55.61% <ø> (ø)
Windows_3 44.47% <100.00%> (-0.01%) ⬇️
Windows_4 34.20% <100.00%> (-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.

Signed-off-by: Qingyang(Abby) Hu <abigailhu2000@gmail.com>
@abbyhu2000 abbyhu2000 force-pushed the backport/backport-7314-to-2.x branch from 5bd5cba to d62015f Compare July 23, 2024 19:14
@ananzh ananzh merged commit 425afd4 into opensearch-project:2.x Jul 24, 2024
64 of 65 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

ananzh pushed a commit to ananzh/OpenSearch-Dashboards that referenced this pull request Jul 24, 2024
…ensearch-project#7291) (opensearch-project#7293) (opensearch-project#7408)

* [Discover-next] remove plugin config toggle for data enhancements

Remove the data config toggle for enhancements and rely on the
UI settings for being enabled.

(cherry picked from commit 5761207)

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Qingyang(Abby) Hu <abigailhu2000@gmail.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.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.

3 participants