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: add panel options shared content #87258

Merged
merged 5 commits into from
May 2, 2024

Conversation

imatwawana
Copy link
Collaborator

This PR adds a shared file with panel options for visualizations and adds that file to relevant visualizations. This PR also fixes version interpolation syntax and adds Cloud links on some pages.

@imatwawana 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 2, 2024
@imatwawana imatwawana added this to the 11.1.x milestone May 2, 2024
@imatwawana imatwawana requested a review from a team May 2, 2024 15:54
@imatwawana imatwawana self-assigned this May 2, 2024
@imatwawana imatwawana requested a review from Eve832 as a code owner May 2, 2024 15:54
@imatwawana imatwawana requested review from Develer and adela-almasan and removed request for a team and Eve832 May 2, 2024 15:54
Copy link
Contributor

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

1 similar comment
Copy link
Contributor

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

@imatwawana imatwawana linked an issue May 2, 2024 that may be closed by this pull request
Copy link
Contributor

@baldm0mma baldm0mma left a comment

Choose a reason for hiding this comment

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

LGTM

@imatwawana imatwawana merged commit f8d9f85 into main May 2, 2024
11 checks passed
@imatwawana imatwawana deleted the ihm/020524-panel-options-shared-content branch May 2, 2024 18:17
grafana-delivery-bot bot pushed a commit that referenced this pull request May 2, 2024
* Added panel options shared file

* Added panel options shared file to visualizations pages

* Fixed version interpolation syntax and added Cloud links

* Fixed heading level of title

(cherry picked from commit f8d9f85)
imatwawana added a commit that referenced this pull request May 13, 2024
Docs: add panel options shared content (#87258)

* Added panel options shared file

* Added panel options shared file to visualizations pages

* Fixed version interpolation syntax and added Cloud links

* Fixed heading level of title

(cherry picked from commit f8d9f85)

Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
@kevinwcyu kevinwcyu modified the milestones: 11.1.x, 11.1.0 Jun 21, 2024
@imatwawana imatwawana added backport v10.3.x Mark PR for automatic backport to v10.3.x backport v10.4.x labels Jun 25, 2024
Copy link
Contributor

The backport to v10.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-87258-to-v10.3.x origin/v10.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x f8d9f8541b4af7a499ef092572c099ca4f343b81

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-87258-to-v10.3.x
# Create the PR body template
PR_BODY=$(gh pr view 87258 --json body --template 'Backport f8d9f8541b4af7a499ef092572c099ca4f343b81 from #87258{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[v10.3.x] Docs: add panel options shared content' --body-file - --label 'type/docs' --label 'no-changelog' --label 'backport' --base v10.3.x --milestone 10.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-87258-to-v10.3.x

# Create a pull request where the `base` branch is `v10.3.x` and the `compare`/`head` branch is `backport-87258-to-v10.3.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87258-to-v10.3.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label Jun 25, 2024
Copy link
Contributor

The backport to v10.4.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-87258-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 f8d9f8541b4af7a499ef092572c099ca4f343b81

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-87258-to-v10.4.x
# Create the PR body template
PR_BODY=$(gh pr view 87258 --json body --template 'Backport f8d9f8541b4af7a499ef092572c099ca4f343b81 from #87258{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[v10.4.x] Docs: add panel options shared content' --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-87258-to-v10.4.x

# Create a pull request where the `base` branch is `v10.4.x` and the `compare`/`head` branch is `backport-87258-to-v10.4.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87258-to-v10.4.x

imatwawana added a commit that referenced this pull request Jun 25, 2024
* Added panel options shared file

* Added panel options shared file to visualizations pages

* Fixed version interpolation syntax and added Cloud links

* Fixed heading level of title

(cherry picked from commit f8d9f85)
imatwawana added a commit that referenced this pull request Jun 25, 2024
* Added panel options shared file

* Added panel options shared file to visualizations pages

* Fixed version interpolation syntax and added Cloud links

* Fixed heading level of title

(cherry picked from commit f8d9f85)
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Docs: create shared content for common options in visualizations
3 participants