-
Notifications
You must be signed in to change notification settings - Fork 11.6k
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: public dashboards fixes #87870
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
imatwawana
added
type/docs
no-changelog
Skip including change in changelog/release notes
backport v11.0.x
Mark PR for automatic backport to v11.0.x
labels
May 14, 2024
This PR must be merged before a backport PR will be created. |
1 similar comment
This PR must be merged before a backport PR will be created. |
2 tasks
evictorero
approved these changes
May 16, 2024
grafana-delivery-bot bot
pushed a commit
that referenced
this pull request
May 16, 2024
* Made minor style fixes * Converted docs ref links to ref URIs and updated note style to admonitions * Fixed link text and version syntax (cherry picked from commit 80e2af5)
imatwawana
added
backport v10.4.x
backport v10.3.x
Mark PR for automatic backport to v10.3.x
labels
May 22, 2024
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-87870-to-v10.4.x origin/v10.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 80e2af5d256360e94677d842c3e5155095a13750 When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-87870-to-v10.4.x
# Create the PR body template
PR_BODY=$(gh pr view 87870 --json body --template 'Backport 80e2af5d256360e94677d842c3e5155095a13750 from #87870{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[v10.4.x] Docs: public dashboards fixes' --body-file - --label 'type/docs' --label 'no-changelog' --label 'backport' --base v10.4.x --milestone 10.4.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-87870-to-v10.4.x
# Create a pull request where the `base` branch is `v10.4.x` and the `compare`/`head` branch is `backport-87870-to-v10.4.x`.
# Remove the local backport branch
git switch main
git branch -D backport-87870-to-v10.4.x |
grafana-delivery-bot
bot
added
the
backport-failed
Failed to generate backport PR. Please resolve conflicts and create one manually.
label
May 22, 2024
grafana-delivery-bot bot
pushed a commit
that referenced
this pull request
May 22, 2024
* Made minor style fixes * Converted docs ref links to ref URIs and updated note style to admonitions * Fixed link text and version syntax (cherry picked from commit 80e2af5)
imatwawana
added a commit
that referenced
this pull request
May 23, 2024
* Made minor style fixes * Converted docs ref links to ref URIs and updated note style to admonitions * Fixed link text and version syntax (cherry picked from commit 80e2af5)
imatwawana
added a commit
that referenced
this pull request
May 23, 2024
* Docs: public dashboards fixes (#87870) * Made minor style fixes * Converted docs ref links to ref URIs and updated note style to admonitions * Fixed link text and version syntax (cherry picked from commit 80e2af5) * Reverted link type * Reverted note type * Removed closing admonition tag --------- Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com> Co-authored-by: Isabel Matwawana <isabel.matwawana@grafana.com>
imatwawana
added a commit
that referenced
this pull request
May 23, 2024
* Docs: public dashboards fixes (#87870) * Made minor style fixes * Converted docs ref links to ref URIs and updated note style to admonitions * Fixed link text and version syntax (cherry picked from commit 80e2af5) * Removed leftover merge conflict copy * Removed second set of ref URIs * Fixed ref text
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport v10.3.x
Mark PR for automatic backport to v10.3.x
backport v10.4.x
backport v11.0.x
Mark PR for automatic backport to v11.0.x
backport-failed
Failed to generate backport PR. Please resolve conflicts and create one manually.
no-changelog
Skip including change in changelog/release notes
type/docs
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Minor style fixes including updating old note style to admonitions.
This PR also updates the linking style from
docs/refs
toref URIs
, which is now the preferred method when linking from source content that's used in multiple projects (i.e., Grafana and Grafana Cloud).