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

Alerting: Show panels within collapsed rows in dashboard picker #75490

Merged
merged 3 commits into from
Sep 27, 2023

Conversation

VikaCep
Copy link
Contributor

@VikaCep VikaCep commented Sep 26, 2023

What is this feature?

Currently, when creating an alert rule and linking it to a dashboard and panel, the picker is not showing panels within collapsed rows. Additionally, it's listing rows as panels. This PR fixes that by allowing to choose from panels that are within collapsed rows and also filters out rows from the modal.

Why do we need this feature?

To be able to select panels within collapsed rows.

Who is this feature for?

All users

Which issue(s) does this PR fix?:

Fixes #75093

2023-09-26 15 06 31

@VikaCep VikaCep added this to the 10.1.x milestone Sep 26, 2023
@VikaCep VikaCep requested a review from a team as a code owner September 26, 2023 18:07
@VikaCep VikaCep self-assigned this Sep 26, 2023
@VikaCep VikaCep requested review from gillesdemey, konrad147 and soniaAguilarPeiron and removed request for a team September 26, 2023 18:07
@grafana-delivery-bot grafana-delivery-bot bot modified the milestones: 10.1.x, 10.2.x Sep 26, 2023
@grafana-delivery-bot
Copy link
Contributor

Hello @VikaCep!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@VikaCep VikaCep changed the title Show panels within collapsed rows in dashboard picker Alerting: Show panels within collapsed rows in dashboard picker Sep 26, 2023
Copy link
Member

@soniaAguilarPeiron soniaAguilarPeiron left a comment

Choose a reason for hiding this comment

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

LGTM!

@VikaCep VikaCep merged commit 14e94d6 into main Sep 27, 2023
@VikaCep VikaCep deleted the alerting/selecting-collapsed-row-panels branch September 27, 2023 12:15
@grafana-delivery-bot
Copy link
Contributor

The backport to v10.1.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-75490-to-v10.1.x origin/v10.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 14e94d663fdca4f90883cc9864bedd3719f04e88
# 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-75490-to-v10.1.x
# Create the PR body template
PR_BODY=$(gh pr view 75490 --json body --template 'Backport 14e94d663fdca4f90883cc9864bedd3719f04e88 from #75490{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.1.x] Alerting: Show panels within collapsed rows in dashboard picker" --body-file - --label "type/bug" --label "area/alerting" --label "area/frontend" --label "add to changelog" --label "backport" --base v10.1.x --milestone 10.1.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-75490-to-v10.1.x

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

# Remove the local backport branch
git switch main
git branch -D backport-75490-to-v10.1.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 Sep 27, 2023
@zerok zerok removed this from the 10.2.x milestone Oct 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/alerting Grafana Alerting area/frontend backport v10.1.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. type/bug
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Alerting: unable to select panel in collapsed row
3 participants