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: Swap order between Annotations and Labels step in the alert rule form. #81060

Merged
merged 4 commits into from
Jan 25, 2024

Conversation

soniaAguilarPeiron
Copy link
Member

@soniaAguilarPeiron soniaAguilarPeiron commented Jan 23, 2024

What is this feature?

This PR change the order in steps in the alert rule form and updates some texts. (Same change is done in the Modfiy export form)
This PR also fix data source and panel label not being correct.

Before the change we had:
4. Add annotations
5. Labels and notifications

After the change:
4. Configure labels and notifications
5. Add annotations

Why do we need this feature?

We need to provide the best user experience, and with this change we think users can go through the steps in a more logical way.

Who is this feature for?

All users.

Special notes for your reviewer:

Screenshot 2024-01-23 at 13 37 21

Recording rules are not affected:

Screenshot 2024-01-23 at 13 00 09

Before the data source and panel label fix:

Screenshot 2024-01-23 at 15 34 43

After the data source and panel label fix:

Screenshot 2024-01-23 at 15 34 09

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

@soniaAguilarPeiron soniaAguilarPeiron added this to the 10.4.x milestone Jan 23, 2024
@soniaAguilarPeiron soniaAguilarPeiron self-assigned this Jan 23, 2024
@soniaAguilarPeiron soniaAguilarPeiron requested a review from a team as a code owner January 23, 2024 12:03
@soniaAguilarPeiron soniaAguilarPeiron requested review from gillesdemey, konrad147 and brendamuir and removed request for a team January 23, 2024 12:03
@soniaAguilarPeiron
Copy link
Member Author

I think we should update docs , right? @brendamuir

@soniaAguilarPeiron soniaAguilarPeiron changed the title Alerting: Swap order between Annotations and Labels and notifications step in the alert rule form. Alerting: Swap order between Annotations and Labels step in the alert rule form. Jan 23, 2024
case Annotation.panelID:
label = '';
break;
default:
Copy link
Member Author

Choose a reason for hiding this comment

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

this was a 🐛

Copy link
Contributor

Choose a reason for hiding this comment

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

nice catch!

Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder why dashboardUID has Dashboard and panel label while panelID is empty?

Copy link
Member Author

Choose a reason for hiding this comment

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

good question @konrad147 . Because we want to show the label only for the dashboard item.
See screenshots above, in case of panel field, we don't want to show any label (because we show the dashboard and panel selected next to the dashboard field)

Copy link
Contributor

@konrad147 konrad147 left a comment

Choose a reason for hiding this comment

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

LGTM! one question in the review

case Annotation.panelID:
label = '';
break;
default:
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder why dashboardUID has Dashboard and panel label while panelID is empty?

@soniaAguilarPeiron soniaAguilarPeiron merged commit 0bcc60f into main Jan 25, 2024
14 checks passed
@soniaAguilarPeiron soniaAguilarPeiron deleted the alerting/alert-form-steps-order-change branch January 25, 2024 08:57
@aangelisc aangelisc modified the milestones: 10.4.x, 10.4.0 Mar 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants