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: remove reference to Agent Flow #14449

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Conversation

JStickler
Copy link
Contributor

What this PR does / why we need it:

When I updated the docs from Grafana Agent -> Grafana Alloy, I missed a reference to Agent Flow.

@JStickler JStickler added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Oct 10, 2024
@JStickler JStickler requested a review from a team as a code owner October 10, 2024 14:49
@JStickler JStickler merged commit 5d477fb into grafana:main Oct 10, 2024
64 of 65 checks passed
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Oct 10, 2024

The backport to release-3.1.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-14449-to-release-3.1.x origin/release-3.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5d477fb6a8ec273af64d89bbdb697bc30a341687

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-14449-to-release-3.1.x
# Create the PR body template
PR_BODY=$(gh pr view 14449 --json body --template 'Backport 5d477fb6a8ec273af64d89bbdb697bc30a341687 from #14449{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'docs: remove reference to Agent Flow (backport release-3.1.x)' --body-file - --label 'size/XS' --label 'type/docs' --label 'backport' --base release-3.1.x --milestone release-3.1.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-14449-to-release-3.1.x

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

# Remove the local backport branch
git switch main
git branch -D backport-14449-to-release-3.1.x

loki-gh-app bot pushed a commit that referenced this pull request Oct 10, 2024
loki-gh-app bot pushed a commit that referenced this pull request Oct 10, 2024
JStickler added a commit that referenced this pull request Oct 10, 2024
@JStickler JStickler deleted the 2024.10.10_flow branch November 4, 2024 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3.0.x backport release-3.1.x backport release-3.2.x backport-failed size/XS 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