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

[v10.1.x] Alerting: Fix incorrect timing meta information for policy #73695

Merged
merged 1 commit into from
Aug 23, 2023

Conversation

grafana-delivery-bot[bot]
Copy link
Contributor

Backport a01a903 from #73675


What is this feature?

This PR does two things

  1. Moves the computeInheritedTree function to utils and adds a few tests
  2. Updates the Policy component to no longer show the default timing options if we're also inheriting from the parent.

Which issue(s) does this PR fix?:

Fixes #73573

The inheritance algorithm was working as intended, but the component showed both the default timing options and inherited properties, which it shouldn't (with the exception of the default policy, which cannot inherit from a parent).

Special notes for your reviewer:

I didn't write a regression test for this in Policy.test.tsx but might be a good addition to this PR :)

@grafana-delivery-bot grafana-delivery-bot bot requested a review from a team as a code owner August 23, 2023 15:14
@grafana-delivery-bot grafana-delivery-bot bot requested review from gillesdemey, VikaCep, konrad147 and soniaAguilarPeiron and removed request for a team August 23, 2023 15:14
@grafana-delivery-bot grafana-delivery-bot bot added this to the 10.1.x milestone Aug 23, 2023
@gillesdemey gillesdemey merged commit b820709 into v10.1.x Aug 23, 2023
17 checks passed
@gillesdemey gillesdemey deleted the backport-73675-to-v10.1.x branch August 23, 2023 15:28
@guicaulada guicaulada modified the milestones: 10.1.x, 10.1.1 Aug 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

2 participants