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

Added CIDR modifier for detection fields #693

Merged

Conversation

amsiglan
Copy link
Collaborator

@amsiglan amsiglan commented Sep 2, 2023

Description

To provide IP ranges in the detection fields of a rule, we need to support the cidr modifier option. This PR adds that option in the dropdown. It also fixes a couple of edge cases for detection parsing

Check List

  • Commits are signed per the DCO using --signoff

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.

@codecov
Copy link

codecov bot commented Sep 2, 2023

Codecov Report

Merging #693 (69322f1) into main (c26b693) will increase coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #693      +/-   ##
==========================================
+ Coverage   31.27%   31.30%   +0.02%     
==========================================
  Files         150      150              
  Lines        4787     4789       +2     
  Branches      790      792       +2     
==========================================
+ Hits         1497     1499       +2     
  Misses       3112     3112              
  Partials      178      178              

see 1 file with indirect coverage changes

Copy link
Collaborator

@AWSHurneyt AWSHurneyt left a comment

Choose a reason for hiding this comment

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

Cypress workflow failed because the backend plugin failed to start (link).

@amsiglan
Copy link
Collaborator Author

amsiglan commented Sep 5, 2023

Failed test is unrelated to the change in this PR

@amsiglan amsiglan merged commit 7e5985f into opensearch-project:main Sep 5, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 5, 2023
Signed-off-by: Amardeepsingh Siglani <[email protected]>
(cherry picked from commit 7e5985f)
amsiglan added a commit that referenced this pull request Sep 6, 2023
Signed-off-by: Amardeepsingh Siglani <[email protected]>
(cherry picked from commit 7e5985f)

Co-authored-by: Amardeepsingh Siglani <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 22, 2023
Signed-off-by: Amardeepsingh Siglani <[email protected]>
(cherry picked from commit 7e5985f)
amsiglan added a commit that referenced this pull request Nov 29, 2023
Signed-off-by: Amardeepsingh Siglani <[email protected]>
(cherry picked from commit 7e5985f)

Co-authored-by: Amardeepsingh Siglani <[email protected]>
@opensearch-trigger-bot
Copy link
Contributor

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

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

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