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

docs: update topics for Blooms #15028

Merged
merged 1 commit into from
Nov 20, 2024
Merged

docs: update topics for Blooms #15028

merged 1 commit into from
Nov 20, 2024

Conversation

JStickler
Copy link
Contributor

What this PR does / why we need it:

Makes small updates to the Structured Metadata and Query Acceleration topics to support the Loki 3.3 version of Query acceleration with Blooms and the GA of Explore Logs.

@JStickler JStickler added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Nov 19, 2024
@JStickler JStickler requested a review from a team as a code owner November 19, 2024 21:19
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 19, 2024

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

Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

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

LGTM!

@JStickler JStickler merged commit 469b54e into main Nov 20, 2024
64 checks passed
@JStickler JStickler deleted the 2024.11.19_blooms branch November 20, 2024 16:10
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 20, 2024

The backport to release-3.3.x 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-15028-to-release-3.3.x origin/release-3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 469b54e3d58807d4bc24e4d247a2a205036b0954

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-15028-to-release-3.3.x
# Create the PR body template
PR_BODY=$(gh pr view 15028 --json body --template 'Backport 469b54e3d58807d4bc24e4d247a2a205036b0954 from #15028{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'docs: update topics for Blooms (backport release-3.3.x)' --body-file - --label 'size/M' --label 'type/docs' --label 'backport' --base release-3.3.x --milestone release-3.3.x --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-15028-to-release-3.3.x

# Create a pull request where the `base` branch is `release-3.3.x` and the `compare`/`head` branch is `backport-15028-to-release-3.3.x`.

# Remove the local backport branch
git switch main
git branch -D backport-15028-to-release-3.3.x

JStickler added a commit that referenced this pull request Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3.3.x backport-failed size/M type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants