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 findings page crash and rule severity correctness #1160

Merged
merged 2 commits into from
Sep 11, 2024

Conversation

jowg-amazon
Copy link
Contributor

Description

  1. Fixes the findings page crash when a custom rule generated a finding and was deleted.
  2. Fixes the correctness of the findings rule severity so that it always shows the highest severity in the table.
  3. FIxes the correctness of the correlations findings table in the flyout to show the rule with the highest severity. However, this currently excludes threat intel rules.
    Screenshot 2024-09-11 at 10 22 49 AM

Issues Resolved

[List any issues this PR will resolve]

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.

amsiglan and others added 2 commits September 11, 2024 14:54
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
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.

Left a clarification question; but otherwise the changes LGTM. Approving assuming CI passes, and we don't need the null checks I asked about.

@jowg-amazon
Copy link
Contributor Author

@AWSHurneyt AWSHurneyt merged commit 1164b98 into opensearch-project:main Sep 11, 2024
12 of 18 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 11, 2024
* bug fix

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

* fix correlation finding severity

Signed-off-by: Joanne Wang <jowg@amazon.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 1164b98)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

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

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

@AWSHurneyt
Copy link
Collaborator

Per offline conversation with @jowg-amazon, backporting this PR to 2.13+.

jowg-amazon added a commit to jowg-amazon/security-analytics-dashboards-plugin that referenced this pull request Sep 11, 2024
…ject#1160)

* bug fix

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

* fix correlation finding severity

Signed-off-by: Joanne Wang <jowg@amazon.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
AWSHurneyt pushed a commit that referenced this pull request Sep 11, 2024
* bug fix



* fix correlation finding severity



---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
AWSHurneyt pushed a commit that referenced this pull request Sep 11, 2024
* bug fix



* fix correlation finding severity



---------




(cherry picked from commit 1164b98)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
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>
Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.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