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] Avoid showing unhelpful error toast when datasource is not yet selected #1187

Merged
merged 1 commit into from
Oct 17, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport e4fdd25 from #1186.

Signed-off-by: Amardeepsingh Siglani <[email protected]>
(cherry picked from commit e4fdd25)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@amsiglan amsiglan merged commit f690f93 into 2.x Oct 17, 2024
11 of 16 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-1187-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f690f93c5b070f5d03c2b054006ca958a4e66e26
# Push it to GitHub
git push --set-upstream origin backport-1187-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-1187-to-2.17.

amsiglan pushed a commit to amsiglan/security-analytics-dashboards-plugin that referenced this pull request Jan 9, 2025
…earch-project#1186) (opensearch-project#1187)

(cherry picked from commit e4fdd25)

Signed-off-by: Amardeepsingh Siglani <[email protected]>
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>
AWSHurneyt pushed a commit that referenced this pull request Jan 10, 2025
* feat: update category (#1169) (#1170)

(cherry picked from commit 8865ff1)

Signed-off-by: SuZhou-Joe <[email protected]>
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>

* Bug fixes for threat intel, duplicate findings, and breadcrumbs path (#1176) (#1177)

* fix spacing for threat intel



* fix alienvault source details page crash



* fix threat intel findings widget view view all url crash



* fix security analtyics breadcrumbs link path crash



* fix duplicate findings



---------


(cherry picked from commit 0ce91fb)

Signed-off-by: Joanne Wang <[email protected]>
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>

* Fit and Finish UX Fixes (#1174) (#1178)

* add plus sign to create detector button



* change getting started to get started



* run yarn test:jest -u



* move tabs to top



* remove duplicate code



* change total active alerts to total active threat alerts



* Add period to end of correlate events content



* fix spacing and padding



* make search and filters compressed



* make search and filter compressed pt 2



* move refresh and actions next to search bar



* move bulk delete to left of search bar



* fix spacing for detector details view



* change content panel from h2 to h3



* remove empty hover state



* fix sizing for empty widget



* fix heading spacing



* change getting started to get started pt2



* run yarn test:jest -u



* add helper function for empty prompt and change to p instead of span



---------


(cherry picked from commit 9c0c2f4)

Signed-off-by: Joanne Wang <[email protected]>
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>

* [Fit&Finish] Security analytics overview page (#1175) (#1179)

* fit&finish



* add width for recent threat alerts card



* fix typo



---------


(cherry picked from commit 076d1ef)

Signed-off-by: Hailong Cui <[email protected]>
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>

* avoid showing unuseful error toast when ds is not yet selected (#1186) (#1187)

(cherry picked from commit e4fdd25)

Signed-off-by: Amardeepsingh Siglani <[email protected]>
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>

* fix: Update getting started cards content and visual design (#1188) (#1189)

(cherry picked from commit 2b33ca2)

Signed-off-by: Viraj Sanghvi <[email protected]>
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>

* testing default ds switch changes (#1199) (#1201)

(cherry picked from commit 5d3801a)

Signed-off-by: Riya Saxena <[email protected]>
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>

* make dataSource default cluster for threat alerts card (#1200) (#1203)

(cherry picked from commit 48669ca)

Signed-off-by: Joanne Wang <[email protected]>
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>

* Fix data source picker for threat alerts card (#1206) (#1207)

* Fix data source picker for threat alerts card



* remove unused import



* fix get alerts loop



---------


(cherry picked from commit b2eb62c)

Signed-off-by: Joanne Wang <[email protected]>
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>

* do not decode ds id from url; update global state on ds change (#1216) (#1217)

(cherry picked from commit ad76b7b)

Signed-off-by: Amardeepsingh Siglani <[email protected]>
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>

---------

Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Joanne Wang <[email protected]>
Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: Amardeepsingh Siglani <[email protected]>
Signed-off-by: Viraj Sanghvi <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.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.

2 participants