-
Notifications
You must be signed in to change notification settings - Fork 48
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
Alerts in correlations #1048
Alerts in correlations #1048
Conversation
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
this.getFindings(); | ||
} | ||
|
||
getFindings = async () => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dedupe these utility methods between the regular alert flyout and this one
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will raise a seperate PR to refactor this.
public/pages/Alerts/components/CorrelationAlertFlyout/CorrelationAlertFlyout.tsx
Outdated
Show resolved
Hide resolved
public/pages/Alerts/components/CorrelationAlertFlyout/CorrelationAlertFlyout.tsx
Outdated
Show resolved
Hide resolved
public/pages/Alerts/components/CorrelationAlertFlyout/CorrelationAlertFlyout.tsx
Outdated
Show resolved
Hide resolved
correlatedItems: CorrelationAlertTableItem[]; | ||
alerts: AlertItem[]; | ||
correlationAlerts: CorrelationAlertTableItem[]; | ||
flyoutData?: { alertItem: AlertItem }; | ||
flyoutCorrelationData?: { alertItem: CorrelationAlertTableItem }; | ||
alertsFiltered: boolean; | ||
filteredCorrelationAlerts: CorrelationAlertTableItem[]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should club all these fields and instead have a single field called tabState
or something which gets updated on tab switch. That way the UI will automatically refresh when the state changes and we don't need to duplicate so much code below
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will raise a seperate PR to refactor this.
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approving with assumption that the code refactor will be done in a quick follow up PR
The backport to
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.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security-analytics-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport-1048-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2ada9e43fd05ef358173f479e995f983e8495ec8
# Push it to GitHub
git push --set-upstream origin backport-1048-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-analytics-dashboards-plugin/backport-2.x Then, create a pull request where the |
The backport to
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-1048-to-2.15
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2ada9e43fd05ef358173f479e995f983e8495ec8
# Push it to GitHub
git push --set-upstream origin backport-1048-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 |
* alerts in Correlations inital commit Signed-off-by: Riya Saxena <[email protected]> * added experimental banner and correlation Signed-off-by: Riya Saxena <[email protected]> * working partially Signed-off-by: Riya Saxena <[email protected]> * bug fix for Findings API and correlationAlert flyout changes Signed-off-by: Riya Saxena <[email protected]> * fixed acknowledge button Signed-off-by: Riya Saxena <[email protected]> * removed redundant files Signed-off-by: Riya Saxena <[email protected]> * bug fixes Signed-off-by: Riya Saxena <[email protected]> * fixed bugs and removed console.log Signed-off-by: Riya Saxena <[email protected]> * removed Generate Message Button Signed-off-by: Riya Saxena <[email protected]> * addressed the comments by UX Signed-off-by: Riya Saxena <[email protected]> * address the comments Signed-off-by: Riya Saxena <[email protected]> * Alerts in Correlations Experimental Signed-off-by: Riya Saxena <[email protected]> * update snapshot for Alert tests Signed-off-by: Riya Saxena <[email protected]> * fix integ tests Signed-off-by: Riya Saxena <[email protected]> * address the review comments Signed-off-by: Riya Saxena <[email protected]> * address the review comments Signed-off-by: Riya Saxena <[email protected]> * timeout removed to fix integ tests Signed-off-by: Riya Saxena <[email protected]> * fixed alert tests Signed-off-by: Riya Saxena <[email protected]> * removed unnecessary change Signed-off-by: Riya Saxena <[email protected]> --------- Signed-off-by: Riya Saxena <[email protected]> (cherry picked from commit 2ada9e4)
The backport to
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.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security-analytics-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport-1048-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2ada9e43fd05ef358173f479e995f983e8495ec8
# Push it to GitHub
git push --set-upstream origin backport-1048-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-analytics-dashboards-plugin/backport-2.x Then, create a pull request where the |
The backport to
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.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security-analytics-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport-1048-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2ada9e43fd05ef358173f479e995f983e8495ec8
# Push it to GitHub
git push --set-upstream origin backport-1048-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-analytics-dashboards-plugin/backport-2.x Then, create a pull request where the |
* alerts in Correlations inital commit Signed-off-by: Riya Saxena <[email protected]> * added experimental banner and correlation Signed-off-by: Riya Saxena <[email protected]> * working partially Signed-off-by: Riya Saxena <[email protected]> * bug fix for Findings API and correlationAlert flyout changes Signed-off-by: Riya Saxena <[email protected]> * fixed acknowledge button Signed-off-by: Riya Saxena <[email protected]> * removed redundant files Signed-off-by: Riya Saxena <[email protected]> * bug fixes Signed-off-by: Riya Saxena <[email protected]> * fixed bugs and removed console.log Signed-off-by: Riya Saxena <[email protected]> * removed Generate Message Button Signed-off-by: Riya Saxena <[email protected]> * addressed the comments by UX Signed-off-by: Riya Saxena <[email protected]> * address the comments Signed-off-by: Riya Saxena <[email protected]> * Alerts in Correlations Experimental Signed-off-by: Riya Saxena <[email protected]> * update snapshot for Alert tests Signed-off-by: Riya Saxena <[email protected]> * fix integ tests Signed-off-by: Riya Saxena <[email protected]> * address the review comments Signed-off-by: Riya Saxena <[email protected]> * address the review comments Signed-off-by: Riya Saxena <[email protected]> * timeout removed to fix integ tests Signed-off-by: Riya Saxena <[email protected]> * fixed alert tests Signed-off-by: Riya Saxena <[email protected]> * removed unnecessary change Signed-off-by: Riya Saxena <[email protected]> --------- Signed-off-by: Riya Saxena <[email protected]> (cherry picked from commit 2ada9e4)
* alerts in Correlations inital commit Signed-off-by: Riya Saxena <[email protected]> * added experimental banner and correlation Signed-off-by: Riya Saxena <[email protected]> * working partially Signed-off-by: Riya Saxena <[email protected]> * bug fix for Findings API and correlationAlert flyout changes Signed-off-by: Riya Saxena <[email protected]> * fixed acknowledge button Signed-off-by: Riya Saxena <[email protected]> * removed redundant files Signed-off-by: Riya Saxena <[email protected]> * bug fixes Signed-off-by: Riya Saxena <[email protected]> * fixed bugs and removed console.log Signed-off-by: Riya Saxena <[email protected]> * removed Generate Message Button Signed-off-by: Riya Saxena <[email protected]> * addressed the comments by UX Signed-off-by: Riya Saxena <[email protected]> * address the comments Signed-off-by: Riya Saxena <[email protected]> * Alerts in Correlations Experimental Signed-off-by: Riya Saxena <[email protected]> * update snapshot for Alert tests Signed-off-by: Riya Saxena <[email protected]> * fix integ tests Signed-off-by: Riya Saxena <[email protected]> * address the review comments Signed-off-by: Riya Saxena <[email protected]> * address the review comments Signed-off-by: Riya Saxena <[email protected]> * timeout removed to fix integ tests Signed-off-by: Riya Saxena <[email protected]> * fixed alert tests Signed-off-by: Riya Saxena <[email protected]> * removed unnecessary change Signed-off-by: Riya Saxena <[email protected]> --------- Signed-off-by: Riya Saxena <[email protected]> (cherry picked from commit 2ada9e4)
* alerts in Correlations inital commit Signed-off-by: Riya Saxena <[email protected]> * added experimental banner and correlation Signed-off-by: Riya Saxena <[email protected]> * working partially Signed-off-by: Riya Saxena <[email protected]> * bug fix for Findings API and correlationAlert flyout changes Signed-off-by: Riya Saxena <[email protected]> * fixed acknowledge button Signed-off-by: Riya Saxena <[email protected]> * removed redundant files Signed-off-by: Riya Saxena <[email protected]> * bug fixes Signed-off-by: Riya Saxena <[email protected]> * fixed bugs and removed console.log Signed-off-by: Riya Saxena <[email protected]> * removed Generate Message Button Signed-off-by: Riya Saxena <[email protected]> * addressed the comments by UX Signed-off-by: Riya Saxena <[email protected]> * address the comments Signed-off-by: Riya Saxena <[email protected]> * Alerts in Correlations Experimental Signed-off-by: Riya Saxena <[email protected]> * update snapshot for Alert tests Signed-off-by: Riya Saxena <[email protected]> * fix integ tests Signed-off-by: Riya Saxena <[email protected]> * address the review comments Signed-off-by: Riya Saxena <[email protected]> * address the review comments Signed-off-by: Riya Saxena <[email protected]> * timeout removed to fix integ tests Signed-off-by: Riya Saxena <[email protected]> * fixed alert tests Signed-off-by: Riya Saxena <[email protected]> * removed unnecessary change Signed-off-by: Riya Saxena <[email protected]> --------- Signed-off-by: Riya Saxena <[email protected]> (cherry picked from commit 2ada9e4)
Description
Issues Resolved
[988]
Testing
1).Create Correlation Rule with Alert Trigger
createCorRule.mov
2). View Correlation Alerts and check Notifications
corrAlerts.mov
3). Error when correlation-rule is deleted
errorScenarios.mov
UX Review changes
After UX review changes incorporated
LogTypes added as a column while viewing Correlation Alerts
Create Correlation Rule
Experimental on the Correlations tab
Check List
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.