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

Register system index descriptors through SystemIndexPlugin.getSystemIndexDescriptors #1837

Merged
merged 4 commits into from
Jun 27, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Jun 21, 2024

Description

This PR registers the system indices in this plugin through the SystemIndexPlugin extension point in core. These indices will not be functionally different than they are today, its just a formal registration as a system index.

Issues Resolved

Related to: opensearch-project/security#4439

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

…IndexDescriptors

Signed-off-by: Craig Perkins <cwperx@amazon.com>
cwperks added 2 commits June 21, 2024 16:33
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@derek-ho derek-ho added the enhancement New feature or request label Jun 24, 2024
Copy link
Collaborator

@derek-ho derek-ho 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 rebase?

@cwperks
Copy link
Member Author

cwperks commented Jun 25, 2024

@derek-ho done

@derek-ho derek-ho merged commit 01ba080 into opensearch-project:main Jun 27, 2024
15 of 16 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1837-to-2.x.

cwperks added a commit to cwperks/observability that referenced this pull request Jun 27, 2024
…IndexDescriptors (opensearch-project#1837)

* Register system index descriptors through SystemIndexPlugin.getSystemIndexDescriptors

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add notebooks index as well

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update baseVersion

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 01ba080)
derek-ho pushed a commit that referenced this pull request Jun 27, 2024
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.

4 participants