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

[Backport 2.x] Add threat alerts card for Analytics (All) workspace use case #1128

Merged
merged 1 commit into from
Sep 4, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 7a23b49 from #1124.

* add data source threat alerts card

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

* refactor RULE_SEVERITY_OPTIONS

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

* fix and run tests

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

* updated based on comments and run yarn test

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

---------

Signed-off-by: Joanne Wang <jowg@amazon.com>
(cherry picked from commit 7a23b49)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@amsiglan amsiglan merged commit 230b7f5 into 2.x Sep 4, 2024
12 of 18 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.17 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.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-1128-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 230b7f50e93ae7d6763d49a3069c04f1b0956e9e
# Push it to GitHub
git push --set-upstream origin backport-1128-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-1128-to-2.17.

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.

2 participants