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

Update url with data source id; redirect on reload if ds id not present; minor fixes #1125

Merged
merged 4 commits into from
Sep 4, 2024

Conversation

amsiglan
Copy link
Collaborator

@amsiglan amsiglan commented Sep 3, 2024

Description

This PR adds logic for updating urls with id of the selected data source and also sets the active data source on reload for view only pages.

Also onboards threat intel related pages to Multi data source selection

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.

…nt; minor fixes

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
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 e55f421 into opensearch-project:main Sep 4, 2024
7 of 12 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x 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.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-1125-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e55f421ee0f492925e0d211fd20b7f2b2615a677
# Push it to GitHub
git push --set-upstream origin backport-1125-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 base branch is 2.x and the compare/head branch is backport-1125-to-2.x.

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

amsiglan added a commit to amsiglan/security-analytics-dashboards-plugin that referenced this pull request Sep 4, 2024
…nt; minor fixes (opensearch-project#1125)

* update url with data source id; redirect on reload if ds id not present; minor fixes

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

* revert unwanted change

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

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
@amsiglan amsiglan mentioned this pull request Sep 4, 2024
1 task
amsiglan added a commit that referenced this pull request Sep 4, 2024
* Update url with data source id; redirect on reload if ds id not present; minor fixes (#1125)

* update url with data source id; redirect on reload if ds id not present; minor fixes

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

* revert unwanted change

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

---------

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

* New home page related UI updates (#1129)

* refactored code

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

* updated overview page with new widgets; added getting started page

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 added a commit to amsiglan/security-analytics-dashboards-plugin that referenced this pull request Sep 4, 2024
…nt; minor fixes (opensearch-project#1125)

* update url with data source id; redirect on reload if ds id not present; minor fixes

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

* revert unwanted change

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 Sep 4, 2024
* Add threat alerts card for Analytics (All) workspace use case (#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>

* Update url with data source id; redirect on reload if ds id not present; minor fixes (#1125)

* update url with data source id; redirect on reload if ds id not present; minor fixes

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

* revert unwanted change

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

---------

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

* New home page related UI updates (#1129)

* refactored code

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

* updated overview page with new widgets; added getting started page

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

---------

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

---------

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

3 participants