opensearch-project / security-analytics

Security Analytics enables users for detecting security threats on their security event log data. It will also allow them to modify/tailor the pre-packaged solution.
Apache License 2.0
72 stars 74 forks source link

fix search monitor query in update threat intel alert status API #1383

Closed eirsep closed 4 weeks ago

eirsep commented 4 weeks ago

Description

Fixes search threat monitor query that fails when detectors are present. This fix was missed in update threat intel alert API Similar to fix: make threat intel run with standard detectors

Related Issues

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

Check List

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.

opensearch-trigger-bot[bot] commented 4 weeks ago

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

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

opensearch-trigger-bot[bot] commented 4 weeks ago

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

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

opensearch-trigger-bot[bot] commented 4 weeks ago

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

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