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

fix(docs): Move promtail configuration to the correct doc #12737

Merged
merged 1 commit into from
Apr 23, 2024

Conversation

MasslessParticle
Copy link
Contributor

fixes #12395

@MasslessParticle MasslessParticle requested a review from a team as a code owner April 22, 2024 21:18
@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Apr 22, 2024
Copy link
Contributor

@JStickler JStickler left a comment

Choose a reason for hiding this comment

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

[docs team] LGTM.
Don't forget to backport please.

@JStickler JStickler merged commit 1161846 into main Apr 23, 2024
61 checks passed
@JStickler JStickler deleted the tpatterson/fix-promtail-doc branch April 23, 2024 16:21
@grafanabot
Copy link
Collaborator

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

1 similar comment
@grafanabot
Copy link
Collaborator

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

@grafanabot
Copy link
Collaborator

The backport to release-2.9.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-12737-to-release-2.9.x origin/release-2.9.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 1161846e19105e2669a5b388998722c23bd0f2f4

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-12737-to-release-2.9.x
# Create the PR body template
PR_BODY=$(gh pr view 12737 --json body --template 'Backport 1161846e19105e2669a5b388998722c23bd0f2f4 from #12737{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "chore: [release-2.9.x] fix(docs): Move promtail configuration to the correct doc" --body-file - --label "size/S" --label "type/docs" --label "backport" --base release-2.9.x --milestone release-2.9.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-12737-to-release-2.9.x

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

# Remove the local backport branch
git switch main
git branch -D backport-12737-to-release-2.9.x

grafanabot pushed a commit that referenced this pull request Apr 23, 2024
JStickler added a commit that referenced this pull request Apr 23, 2024
JStickler added a commit that referenced this pull request Apr 29, 2024
JStickler added a commit that referenced this pull request Apr 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-2.9.x backport release-3.0.x backport-failed size/S 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.

Please clarify/fix documentation about configuration reload and extend systemd service unit
3 participants