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

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

Merged
merged 1 commit into from
Oct 25, 2024

Conversation

eirsep
Copy link
Member

@eirsep eirsep commented Oct 24, 2024

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

  • 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.

@eirsep eirsep merged commit 3d1fcd5 into opensearch-project:main Oct 25, 2024
8 of 13 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 25, 2024
Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 3d1fcd5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

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
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/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
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/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.

eirsep added a commit to eirsep/security-analytics that referenced this pull request Oct 25, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 25, 2024
Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 3d1fcd5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
eirsep pushed a commit that referenced this pull request Oct 25, 2024
…) (#1384)

(cherry picked from commit 3d1fcd5)

Signed-off-by: Surya Sashank Nistala <[email protected]>
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>
opensearch-trigger-bot bot added a commit that referenced this pull request Oct 25, 2024
…) (#1384)

(cherry picked from commit 3d1fcd5)

Signed-off-by: Surya Sashank Nistala <[email protected]>
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>
(cherry picked from commit 8077fc7)
eirsep added a commit that referenced this pull request Oct 25, 2024
eirsep pushed a commit that referenced this pull request Oct 25, 2024
…) (#1384) (#1387)

(cherry picked from commit 3d1fcd5)

Signed-off-by: Surya Sashank Nistala <[email protected]>
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>
(cherry picked from commit 8077fc7)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-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