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

Pass dataSourceId for alert summary/insight #321

Merged
merged 3 commits into from
Sep 20, 2024

Conversation

qianheng-aws
Copy link
Contributor

Description

Pass dataSourceId for alert summary/insight

Issues Resolved

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test.
  • New functionality has user manual doc added.
  • 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.

…ceFix

# Conflicts:
#	public/components/incontext_insight/generate_popover_body.tsx
Signed-off-by: Heng Qian <[email protected]>
@Hailong-am Hailong-am added the backport 2.x Trigger the backport flow to 2.x label Sep 20, 2024
@@ -89,6 +91,7 @@ export const GeneratePopoverBody: React.FC<{
question: summarizationQuestion,
context: contextContent,
}),
query: dataSourceQuery,
Copy link
Collaborator

@Hailong-am Hailong-am Sep 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we add test case to verify datasource has been set correctly?

@Hailong-am Hailong-am merged commit 32a3255 into opensearch-project:main Sep 20, 2024
11 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/dashboards-assistant/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-assistant/backport-2.x
# Create a new branch
git switch --create backport/backport-321-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 32a32557b39e5e6b236f9f6f5843e09ef020f724
# Push it to GitHub
git push --set-upstream origin backport/backport-321-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-assistant/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-321-to-2.x.

@Hailong-am Hailong-am added backport 2.x Trigger the backport flow to 2.x and removed backport 2.x Trigger the backport flow to 2.x labels Sep 20, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 20, 2024
* Pass dataSourceId for alert summary/insight

Signed-off-by: Heng Qian <[email protected]>

* Add CHANGELOG.md

Signed-off-by: Heng Qian <[email protected]>

---------

Signed-off-by: Heng Qian <[email protected]>
(cherry picked from commit 32a3255)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
ruanyl pushed a commit that referenced this pull request Sep 24, 2024
* Pass dataSourceId for alert summary/insight

Signed-off-by: Heng Qian <[email protected]>

* Add CHANGELOG.md

Signed-off-by: Heng Qian <[email protected]>

---------

Signed-off-by: Heng Qian <[email protected]>
(cherry picked from commit 32a3255)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

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
Labels
backport 2.x Trigger the backport flow to 2.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants