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

Comply with the root agent id config change in dashboards-assistant #1053

Merged

Conversation

SuZhou-Joe
Copy link
Member

@SuZhou-Joe SuZhou-Joe commented Feb 5, 2024

Description

opensearch-project/dashboards-assistant#127
In dashboard-assistant repo, we changed the implementation of how to retrieve the root agent id.

Issues Resolved

[List any issues this PR will resolve]

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.

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
@SuZhou-Joe SuZhou-Joe changed the title feat: update agent id into config index Comply with the root agent id config change in dashboards-assistant Feb 6, 2024
@SuZhou-Joe
Copy link
Member Author

SuZhou-Joe commented Feb 6, 2024

A test case is flaky because of the opensearch-project/ml-commons#1894, I intentionally add a test to see if the suggestions returns stable.

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
@SuZhou-Joe SuZhou-Joe merged commit 7625e00 into opensearch-project:2.x Feb 6, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to main failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-main main
# Navigate to the new working tree
cd .worktrees/backport-main
# Create a new branch
git switch --create backport/backport-1053-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7625e0074a4e684ce521f71503756b4b6aa23910
# Push it to GitHub
git push --set-upstream origin backport/backport-1053-to-main
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-main

Then, create a pull request where the base branch is main and the compare/head branch is backport/backport-1053-to-main.

SuZhou-Joe added a commit to SuZhou-Joe/opensearch-dashboards-functional-test that referenced this pull request Feb 6, 2024
…pensearch-project#1053)

* feat: update agent id into config index

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: enable agent framework

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: update url

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: update settings

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: test in security disabled

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: run without security

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize config retrieve logic

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: enable run when security enabled

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: enable run when security enabled

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: add some comment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
(cherry picked from commit 7625e00)
SuZhou-Joe added a commit that referenced this pull request Feb 6, 2024
…1053) (#1062)

* feat: update agent id into config index

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: enable agent framework

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: update url

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: update settings

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: test in security disabled

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: run without security

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: optimize config retrieve logic

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: enable run when security enabled

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: enable run when security enabled

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: add some comment

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
(cherry picked from commit 7625e00)
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