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 examples to TraceQL doc #4471

Conversation

knylander-grafana
Copy link
Contributor

What this PR does:

Moves the Examples section under Construct a TraceQL query. Updates the examples.

Which issue(s) this PR fixes:
Fixes #https://github.com/grafana/tempo-squad/issues/355

Checklist

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

Copy link
Contributor

This PR must be merged before a backport PR will be created.

1 similar comment
Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Member

@mapno mapno left a comment

Choose a reason for hiding this comment

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

LGTM, just one comment

docs/sources/tempo/traceql/_index.md Outdated Show resolved Hide resolved
@knylander-grafana knylander-grafana changed the title [DIC] Update examples to TraceQL doc [DOC] Update examples to TraceQL doc Dec 19, 2024
@knylander-grafana knylander-grafana added the backport release-v2.7 Backport for V2.7 label Jan 7, 2025
Copy link
Contributor

github-actions bot commented Jan 7, 2025

This PR must be merged before a backport PR will be created.

@knylander-grafana knylander-grafana enabled auto-merge (squash) January 7, 2025 15:42
@knylander-grafana knylander-grafana enabled auto-merge (squash) January 7, 2025 16:16
@knylander-grafana knylander-grafana merged commit 39e8cf8 into grafana:main Jan 7, 2025
16 checks passed
Copy link
Contributor

github-actions bot commented Jan 7, 2025

The backport to release-v2.6 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-4471-to-release-v2.6 origin/release-v2.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 39e8cf868266b7e2fac9b8f3d7c5d6baf788667d

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-4471-to-release-v2.6
# Create the PR body template
PR_BODY=$(gh pr view 4471 --json body --template 'Backport 39e8cf868266b7e2fac9b8f3d7c5d6baf788667d from #4471{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.6] [DOC] Update examples to TraceQL doc' --body-file - --label 'type/docs' --label 'backport' --base release-v2.6 --milestone release-v2.6 --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-4471-to-release-v2.6

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

# Remove the local backport branch
git switch main
git branch -D backport-4471-to-release-v2.6

Copy link
Contributor

github-actions bot commented Jan 7, 2025

The backport to release-v2.7 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-4471-to-release-v2.7 origin/release-v2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 39e8cf868266b7e2fac9b8f3d7c5d6baf788667d

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-4471-to-release-v2.7
# Create the PR body template
PR_BODY=$(gh pr view 4471 --json body --template 'Backport 39e8cf868266b7e2fac9b8f3d7c5d6baf788667d from #4471{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.7] [DOC] Update examples to TraceQL doc' --body-file - --label 'type/docs' --label 'backport' --base release-v2.7 --milestone release-v2.7 --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-4471-to-release-v2.7

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

# Remove the local backport branch
git switch main
git branch -D backport-4471-to-release-v2.7

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-v2.6 backport release-v2.7 Backport for V2.7 backport-failed type/docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants