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 support for editing correlation rule #643

Merged

Conversation

amsiglan
Copy link
Collaborator

Description

This PR adds support for editing a correlation rule

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.

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
@codecov
Copy link

codecov bot commented Jul 12, 2023

Codecov Report

Merging #643 (86c29d5) into main (205ee18) will decrease coverage by 0.15%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #643      +/-   ##
==========================================
- Coverage   32.66%   32.51%   -0.15%     
==========================================
  Files         139      139              
  Lines        4491     4527      +36     
  Branches      803      748      -55     
==========================================
+ Hits         1467     1472       +5     
- Misses       2847     2878      +31     
  Partials      177      177              

see 6 files with indirect coverage changes

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
@amsiglan amsiglan merged commit 0fee0e8 into opensearch-project:main Jul 12, 2023
6 of 9 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 12, 2023
* added support for editing correlation rule

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed query deletion; api method

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* removed logs

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed rule expression builder

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 0fee0e8)
@opensearch-trigger-bot
Copy link
Contributor

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

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

amsiglan added a commit to amsiglan/security-analytics-dashboards-plugin that referenced this pull request Jul 12, 2023
* added support for editing correlation rule

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed query deletion; api method

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* removed logs

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed rule expression builder

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
amsiglan added a commit that referenced this pull request Jul 12, 2023
* added support for editing correlation rule



* fixed query deletion; api method



* removed logs



* fixed rule expression builder



---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
amsiglan added a commit that referenced this pull request Jul 12, 2023
* added support for editing correlation rule

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed query deletion; api method

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* removed logs

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed rule expression builder

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 0fee0e8)

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
AWSHurneyt pushed a commit to AWSHurneyt/security-analytics-dashboards-plugin that referenced this pull request Oct 12, 2023
…pensearch-project#646)

* added support for editing correlation rule



* fixed query deletion; api method



* removed logs



* fixed rule expression builder



---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-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.

4 participants