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

shards assignment to local Node when fanout flag is disabled #1749

Merged
merged 6 commits into from
Dec 17, 2024

Conversation

riysaxen-amzn
Copy link
Collaborator

@riysaxen-amzn riysaxen-amzn commented Dec 17, 2024

Description

During the execution of doc level monitor, this PR check if fanoutEnabled is false and if it is then it force assigns all shards to local node thus effectively making the fan-out a single node operation. This is done to avoid Alerts de-dupe generated by Aggregation Sigma Rules.

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
@riysaxen-amzn riysaxen-amzn merged commit fee62b5 into opensearch-project:main Dec 17, 2024
10 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/alerting/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.x
# Create a new branch
git switch --create backport-1749-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fee62b56b6bfd951a8ea588443d5f45c403d72bc
# Push it to GitHub
git push --set-upstream origin backport-1749-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.x

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

sbcd90 pushed a commit to sbcd90/alerting that referenced this pull request Dec 18, 2024
…rch-project#1749)

* shards assignment to local Node when fanout flag is disabled

Signed-off-by: Riya Saxena <[email protected]>

* shards assignment to local Node when fanout flag is disabled

Signed-off-by: Riya Saxena <[email protected]>

* shards assignment to local Node when fanout flag is disabled

Signed-off-by: Riya Saxena <[email protected]>

* shards assignment to local Node when fanout flag is disabled

Signed-off-by: Riya Saxena <[email protected]>

* tests fix

Signed-off-by: Riya Saxena <[email protected]>

* tests fix

Signed-off-by: Riya Saxena <[email protected]>

---------

Signed-off-by: Riya Saxena <[email protected]>
eirsep pushed a commit that referenced this pull request Dec 18, 2024
…1755)

* shards assignment to local Node when fanout flag is disabled



* shards assignment to local Node when fanout flag is disabled



* shards assignment to local Node when fanout flag is disabled



* shards assignment to local Node when fanout flag is disabled



* tests fix



* tests fix



---------

Signed-off-by: Riya Saxena <[email protected]>
Co-authored-by: Riya <[email protected]>
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