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

ENH: support index template for serverless #3071

Merged
merged 4 commits into from
Oct 9, 2023

Conversation

chenqi0805
Copy link
Collaborator

Description

This PR resurrects support for composable index template for opensearch sink serverless ingestion. Thus allowing user to configure index_type: custom under serverless: true.

Note: Amazon OpenSearch Serverless does not support ISM policy plugin as well as the /_cluster/settings API. Thus the fix on checkISMEnabled.

Issues Resolved

#3048

Check List

  • New functionality includes testing.
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed with a real name per the DCO

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.

@github-actions
Copy link

github-actions bot commented Jul 26, 2023

Unit Test Results

  33 files   - 1 315    33 suites   - 1 315   6m 31s ⏱️ - 31m 37s
  54 tests  - 5 219    54 ✔️  - 5 218  0 💤  - 1  0 ±0 
583 runs   - 9 939  583 ✔️  - 9 937  0 💤  - 2  0 ±0 

Results for commit 6200411. ± Comparison against base commit 5262eea.

♻️ This comment has been updated with latest results.

final String enabled = getISMEnabled(response);
return enabled != null && enabled.equals("true");
} catch (OpenSearchException ex) {
if (NON_RETRYABLE_HTTP_STATUS.contains(ex.status())) {
Copy link
Member

Choose a reason for hiding this comment

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

Should we have a stronger check here? This has any non-retryable indicating the ISM is disabled. What if the user lacks access? We might want that error to halt the sink.

@dlvenable
Copy link
Member

We can ignore the WhiteSource checks. This PR does not change our dependencies. Likely it is failing because of the age of the PR and the branch.

@chenqi0805 chenqi0805 merged commit b35ffc2 into main Oct 9, 2023
61 of 62 checks passed
@chenqi0805 chenqi0805 deleted the enh/3048-support-index-template-for-serverless branch October 9, 2023 16:02
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.5 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.5 2.5
# Navigate to the new working tree
cd .worktrees/backport-2.5
# Create a new branch
git switch --create backport/backport-3071-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b35ffc28f5999300f956090a86e51d06842fb3d2
# Push it to GitHub
git push --set-upstream origin backport/backport-3071-to-2.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.5

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

engechas pushed a commit to engechas/data-prepper that referenced this pull request Oct 9, 2023
* ENH: support index template for serverless

Signed-off-by: George Chen <[email protected]>
chenqi0805 added a commit to chenqi0805/data-prepper that referenced this pull request Oct 9, 2023
* ENH: support index template for serverless

Signed-off-by: George Chen <[email protected]>
(cherry picked from commit 73a80a1)
chenqi0805 added a commit that referenced this pull request Oct 10, 2023
* ENH: support index template for serverless

Signed-off-by: George Chen <[email protected]>
(cherry picked from commit 73a80a1)
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