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 annotated image and updated feature overview list #87833

Merged
merged 1 commit into from
May 15, 2024

Conversation

imatwawana
Copy link
Collaborator

No description provided.

@imatwawana imatwawana self-assigned this May 14, 2024
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.1.x milestone May 14, 2024
@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 14, 2024
@imatwawana imatwawana requested review from a team, leeoniya and adela-almasan and removed request for a team May 14, 2024 14:39
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 14, 2024 that may be closed by this pull request
5 tasks
@imatwawana imatwawana merged commit 47b42c9 into main May 15, 2024
21 checks passed
@imatwawana imatwawana deleted the ihm/140524-finish-panel-overview branch May 15, 2024 20:22
grafana-delivery-bot bot pushed a commit that referenced this pull request May 15, 2024
Added annotated image and updated feature overview list

(cherry picked from commit 47b42c9)
imatwawana added a commit that referenced this pull request May 15, 2024
…#87940)

Docs: Add annotated image and updated feature overview list (#87833)

Added annotated image and updated feature overview list

(cherry picked from commit 47b42c9)

Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
@imatwawana imatwawana added backport v10.3.x Mark PR for automatic backport to v10.3.x backport v10.4.x labels May 22, 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-87833-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 47b42c9d4210bfbe274b082a2b1b4714426b19bd

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-87833-to-v10.4.x
# Create the PR on GitHub
gh pr create --title '[v10.4.x] Docs: Add annotated image and updated feature overview list' --body 'Backport 47b42c9d4210bfbe274b082a2b1b4714426b19bd from #87833' --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-87833-to-v10.4.x

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

# Remove the local backport branch
git switch main
git branch -D backport-87833-to-v10.4.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 May 22, 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-87833-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 47b42c9d4210bfbe274b082a2b1b4714426b19bd

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-87833-to-v10.3.x
# Create the PR on GitHub
gh pr create --title '[v10.3.x] Docs: Add annotated image and updated feature overview list' --body 'Backport 47b42c9d4210bfbe274b082a2b1b4714426b19bd from #87833' --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-87833-to-v10.3.x

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

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

@imatwawana imatwawana added backport v10.3.x Mark PR for automatic backport to v10.3.x backport v10.4.x and removed backport v10.3.x Mark PR for automatic backport to v10.3.x backport v10.4.x labels May 23, 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-87833-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 47b42c9d4210bfbe274b082a2b1b4714426b19bd

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-87833-to-v10.3.x
# Create the PR on GitHub
gh pr create --title '[v10.3.x] Docs: Add annotated image and updated feature overview list' --body 'Backport 47b42c9d4210bfbe274b082a2b1b4714426b19bd from #87833' --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-87833-to-v10.3.x

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

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

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-87833-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 47b42c9d4210bfbe274b082a2b1b4714426b19bd

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-87833-to-v10.4.x
# Create the PR on GitHub
gh pr create --title '[v10.4.x] Docs: Add annotated image and updated feature overview list' --body 'Backport 47b42c9d4210bfbe274b082a2b1b4714426b19bd from #87833' --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-87833-to-v10.4.x

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

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

imatwawana added a commit that referenced this pull request May 23, 2024
Added annotated image and updated feature overview list

(cherry picked from commit 47b42c9)
imatwawana added a commit that referenced this pull request May 23, 2024
Added annotated image and updated feature overview list

(cherry picked from commit 47b42c9)
imatwawana added a commit that referenced this pull request May 23, 2024
…#88228)

* Docs: Add annotated image and updated feature overview list (#87833)

Added annotated image and updated feature overview list

(cherry picked from commit 47b42c9)

* Replaced docs refs with ref URIs
imatwawana added a commit that referenced this pull request May 23, 2024
…#88226)

* Docs: Add annotated image and updated feature overview list (#87833)

Added annotated image and updated feature overview list

(cherry picked from commit 47b42c9)

* Apply suggestions from code review

Removed tooltips links

* Removed extra line
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: add a panel overview page
2 participants