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

[DOC] Update Set up test app to use agent flow #3228

Merged

Conversation

knylander-grafana
Copy link
Contributor

@knylander-grafana knylander-grafana commented Dec 12, 2023

What this PR does:

Updates the Set up the test app doc to use Agent Flow and Intro to MLTP as an option.

Which issue(s) this PR fixes:
Fixes #3226

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Copy link
Member

@joe-elliott joe-elliott left a comment

Choose a reason for hiding this comment

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

Couple o thoughts. I didn't test any of the actual config or steps. Trust these are correct.

docs/sources/tempo/setup/set-up-test-app.md Outdated Show resolved Hide resolved
docs/sources/tempo/setup/set-up-test-app.md Outdated Show resolved Hide resolved
docs/sources/tempo/setup/set-up-test-app.md Show resolved Hide resolved
@knylander-grafana knylander-grafana changed the title Update Set up test app to use agent flow [DOC] Update Set up test app to use agent flow Dec 14, 2023
@knylander-grafana
Copy link
Contributor Author

Couple o thoughts. I didn't test any of the actual config or steps. Trust these are correct.

Thank you. You caught some of the places where we had changed from distributor to query but didnt' get all of the changes in the text.

I've asked Heds to do a review to verify that things are correct. When we wrote the doc, he used the configs to make sure that they worked.

Also makes a creation step for `values.yaml` generic.

Signed-off-by: Heds Simons <hedley.simons@grafana.com>
@knylander-grafana knylander-grafana merged commit e11ceb9 into grafana:main Jan 16, 2024
15 checks passed
Copy link
Contributor

The backport to release-v2.3 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 branch
git switch --create backport-3228-to-release-v2.3 origin/release-v2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e11ceb9fcd11382f955dae26439d3ee38eafbc61

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3228-to-release-v2.3
# Create the PR body template
PR_BODY=$(gh pr view 3228 --json body --template 'Backport e11ceb9fcd11382f955dae26439d3ee38eafbc61 from #3228{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-v2.3] [DOC] Update Set up test app to use agent flow" --body-file - --label "type/docs" --label "backport" --base release-v2.3 --milestone release-v2.3 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-3228-to-release-v2.3

# Create a pull request where the `base` branch is `release-v2.3` and the `compare`/`head` branch is `backport-3228-to-release-v2.3`.

# Remove the local backport branch
git switch main
git branch -D backport-3228-to-release-v2.3

knylander-grafana added a commit that referenced this pull request Jan 25, 2024
* Update Set up test app to use agent flow

* Apply suggestions from code review

* Correct a distributor reference to query frontend.

Also makes a creation step for `values.yaml` generic.

Signed-off-by: Heds Simons <hedley.simons@grafana.com>

* Apply suggestions from code review

* Apply suggestions from code review

---------

Signed-off-by: Heds Simons <hedley.simons@grafana.com>
Co-authored-by: Heds Simons <hedley.simons@grafana.com>
(cherry picked from commit e11ceb9)

# Conflicts:
#	docs/sources/tempo/setup/set-up-test-app.md
knylander-grafana added a commit that referenced this pull request Jan 29, 2024
* Update Set up test app to use agent flow

* Apply suggestions from code review

* Correct a distributor reference to query frontend.

Also makes a creation step for `values.yaml` generic.

Signed-off-by: Heds Simons <hedley.simons@grafana.com>

* Apply suggestions from code review

* Apply suggestions from code review

---------

Signed-off-by: Heds Simons <hedley.simons@grafana.com>
Co-authored-by: Heds Simons <hedley.simons@grafana.com>
(cherry picked from commit e11ceb9)

# Conflicts:
#	docs/sources/tempo/setup/set-up-test-app.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-v2.3 backport-failed type/docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[DOC] Update the Set up a test app doc to use Agent Flow
3 participants