Skip to content

[2.9] Backport [#722] fix null query filter conversion from sigma to query string query#743

Merged
eirsep merged 2 commits intoopensearch-project:2.9from
eirsep:null29
Nov 30, 2023
Merged

[2.9] Backport [#722] fix null query filter conversion from sigma to query string query#743
eirsep merged 2 commits intoopensearch-project:2.9from
eirsep:null29

Conversation

@eirsep
Copy link
Copy Markdown
Member

@eirsep eirsep commented Nov 30, 2023

Description

Backports #722 to 2.9

…ensearch-project#722)

* fix null query filter conversion from sigma to query string query

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* fix rule to query conversion tests for null filter

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* enhance test to verify non null doc doesnt match null query

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

---------

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Nov 30, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (a941222) 25.85% compared to head (68de8de) 25.83%.

Additional details and impacted files
@@             Coverage Diff              @@
##                2.9     #743      +/-   ##
============================================
- Coverage     25.85%   25.83%   -0.02%     
+ Complexity      940      939       -1     
============================================
  Files           252      252              
  Lines         10753    10753              
  Branches       1198     1198              
============================================
- Hits           2780     2778       -2     
- Misses         7726     7727       +1     
- Partials        247      248       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@eirsep eirsep merged commit 61909b2 into opensearch-project:2.9 Nov 30, 2023
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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

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

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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

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

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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

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

@opensearch-trigger-bot
Copy link
Copy Markdown
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-743-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 61909b29210f8d88ce858e9407f6f4a2bf3623bc
# Push it to GitHub
git push --set-upstream origin backport/backport-743-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-743-to-2.5.

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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

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

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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

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

riysaxen-amzn pushed a commit to riysaxen-amzn/security-analytics that referenced this pull request Mar 25, 2024
…#744)

* Added 2.5 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.5 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit 780744f89471381a17f92758dd67ac9d4896cff2)

Co-authored-by: AWSHurneyt <hurneyt@amazon.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