Skip to content

fix(docs): add a note on docker configuration.md doc to explain accep… #16299

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

Merged
merged 7 commits into from
Mar 13, 2025

Conversation

amirmotlagh
Copy link
Contributor

…ted values for boolean type refering to issue #16014

What this PR does / why we need it:

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

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR
@amirmotlagh amirmotlagh requested a review from a team as a code owner February 15, 2025 08:49
@CLAassistant
Copy link

CLAassistant commented Feb 15, 2025

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Feb 15, 2025
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] Thanks for taking the time to update the docs. Sorry it took me so long to get to the review, I was on vacation.

@pull-request-size pull-request-size bot added size/L and removed size/S labels Mar 10, 2025
@JStickler
Copy link
Contributor

@amirmotlagh Have you signed the CLA? Or possibly you've submitted this PR under a different email address than the one you've signed the CLA with?

@amirmotlagh
Copy link
Contributor Author

@amirmotlagh Have you signed the CLA? Or possibly you've submitted this PR under a different email address than the one you've signed the CLA with?

The email address was not as same as my github email address. Now it is signed

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, I'll just remove one unnecessary character and then merge.

Removing unnecessary character which may break the note formatting.

Signed-off-by: J Stickler <julie.stickler@grafana.com>
@JStickler JStickler merged commit 2071a50 into grafana:main Mar 13, 2025
61 checks passed
loki-gh-app bot pushed a commit that referenced this pull request Mar 13, 2025
#16299)

Signed-off-by: J Stickler <julie.stickler@grafana.com>
Co-authored-by: J Stickler <julie.stickler@grafana.com>
(cherry picked from commit 2071a50)
loki-gh-app bot pushed a commit that referenced this pull request Mar 13, 2025
#16299)

Signed-off-by: J Stickler <julie.stickler@grafana.com>
Co-authored-by: J Stickler <julie.stickler@grafana.com>
(cherry picked from commit 2071a50)
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Mar 13, 2025

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-16299-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 2071a5098b4e5214fb8f8c646ae0081b39a563af

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-16299-to-release-3.3.x
# Create the PR body template
PR_BODY=$(gh pr view 16299 --json body --template 'Backport 2071a5098b4e5214fb8f8c646ae0081b39a563af from #16299{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix(docs): add a note on docker configuration.md doc to explain accep… (backport release-3.3.x)' --body-file - --label 'size/L' --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-16299-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-16299-to-release-3.3.x`.

# Remove the local backport branch
git switch main
git branch -D backport-16299-to-release-3.3.x
JStickler added a commit that referenced this pull request Mar 13, 2025
#16299)

Signed-off-by: J Stickler <julie.stickler@grafana.com>
Co-authored-by: J Stickler <julie.stickler@grafana.com>
(cherry picked from commit 2071a50)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3.2.x backport release-3.3.x backport release-3.4.x backport-failed size/L type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
3 participants