Alerting: Fix notification policies inheritance algorithm #69304
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gillesdemey
added
type/bug
area/alerting
public/app/features/alerting/unified/components/notification-policies/Policy.tsx
Show resolved
Hide resolved
public/app/features/alerting/unified/components/notification-policies/Policy.tsx
Outdated
Show resolved
Hide resolved
gillesdemey
force-pushed
the
alerting/fix-notification-policies-grouping-copy
branch
from
c212a0d to
151a0bf
Compare
gillesdemey
force-pushed
the
alerting/fix-notification-policies-grouping-copy
branch
from
f71c053 to
75f7f7f
Compare
since the behaviour is currently inconsistent between AM flavors and we're not sure which one is correct
gillesdemey
commented
Jun 6, 2023
| @@ -6,7 +6,7 @@ interface Props {} | |||
|
|
|||
| const Strong = ({ children }: React.PropsWithChildren<Props>) => { | |||
| const theme = useTheme2(); | |||
| return <strong style={{ color: theme.colors.text.maxContrast }}>{children}</strong>; | |||
| return <strong style={{ color: theme.colors.text.primary }}>{children}</strong>; | |||
There was a problem hiding this comment.
unrelated to the fix, but looks better :)
gillesdemey
changed the title
not sure how this one got updated
gillesdemey
commented
Jun 7, 2023
| childRoute: Route, | ||
| propertiesParentInherited?: Partial<InhertitableProperties> | ||
| ) { | ||
| const fullParentProperties = merge({}, parentRoute, propertiesParentInherited); |
There was a problem hiding this comment.
So moving it to a new file makes it hard to make out the differences with the algorithm before, the quick version goes:
- we now compute the entire parent – with its inherited properties – before we create the inherited child properties
- we were previously merging the computed inherited properties with the parent's inherited properties – that's wrong
- since
merge()mutates (ugh) I merge everything in to{}to avoid any weird mutation bugs - we now also inherit from the parent if
group_byis[]
gillesdemey
removed
area/backend
type/ci
This comment was marked as resolved.
This comment was marked as resolved.
grafanabot
added
the
backport-failed
gillesdemey
added a commit
that referenced
this pull request
Jun 8, 2023
(cherry picked from commit f94e07f)
|
Back-port PR here 👉 #69782 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this feature?
This PR fixes the inheritance algorithm to compute what properties are inherited from a parent policy in a child policy.
Additionally
This PR normalizes the behaviour of the notification policies API response between Mimir and the built-in Alertmanager / vanilla Alertmanager.
It also changes to way we write the config for
inherit from parent,group_by: []is only preserved in the configuration by Mimir – other implementations simply returnundefined.Note on grouping
There are several ways to define the
group_byproperty of a notification policy, the following describes the values and their behaviour.group_by: ['label']is just regular groupinggroup_by: []means "inherit from parent" for child policiesgroup_by: []means "single group" for the default (root) policygroup_by: <undefined>(the absence of thegroup_bykey in the policy) inherits the grouping from the parent routegroup_by: ['...']means disable groupingSpecial notes for your reviewer:
Please review the changes in the inheritance algorithm more closely than the rest of the PR – which is mostly updating the UI to take "no grouping" and "single group" semantics in to account.
I also moved that code to this file