Fix make alert rule uid settable to avoid accidental overwriting of existing rule history #1971
+107
−8
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
|
In order to lower resource usage and have a faster runtime, PRs will not run Cloud tests automatically. |
moustafab
force-pushed
the
moustafab/fix-optional-uid
branch
7 times, most recently
from
b44e148 to
c6e5be8
Compare
…xisting rule history Unfortunately this is the only viable workaround. It will require users to manually set the uid for alert rules similar to how it is done in file provisioning. Addresses #1928
moustafab
force-pushed
the
moustafab/fix-optional-uid
branch
from
c6e5be8 to
c7c6a1f
Compare
spinillos
approved these changes
Jan 7, 2025
|
The change looks good to me, however I think there is still a bug that will cause this to be an incomplete fix. Reproduction:
Likely there is a bug in the API that is causing the group to not actually re-order itself. This shouldn't necessarily prevent the merge of this change, but we should probably add a test case to cover this since tests passed here and probably shouldn't have. Other (likely related) cases also fail, such as:
|
moustafab
added a commit
to grafana/grafana
that referenced
this pull request
Jan 31, 2025
This was discovered as part of work to add support `uid` to the alert rule terraform provider. When modifying rule groups the uid can be specified but only if the rule already existed in the DB. If the rule is new the update would be rejected. Additionally, the RuleGroupIdx was not being updated when rules were reordered in the group. TODO: This breaks a number of tests and breaks the PutRule endpoint as it uses the same underlying function. I need to figure out how to bifurcate the usages of the delta calculator as PutRule should not allow creation of new rules. Context: grafana/terraform-provider-grafana#1971 (comment) Relates to: grafana/terraform-provider-grafana#1928
moustafab
added a commit
to grafana/grafana
that referenced
this pull request
Jan 31, 2025
This was discovered as part of work to add support `uid` to the alert rule terraform provider. When modifying rule groups the uid can be specified but only if the rule already existed in the DB. If the rule is new the update would be rejected. Additionally, the RuleGroupIdx was not being updated when rules were reordered in the group. Context: grafana/terraform-provider-grafana#1971 (comment) Relates to: grafana/terraform-provider-grafana#1928
moustafab
added a commit
to grafana/grafana
that referenced
this pull request
Jan 31, 2025
This was discovered as part of work to add support `uid` to the alert rule terraform provider. When modifying rule groups the uid can be specified but only if the rule already existed in the DB. If the rule is new the update would be rejected. Additionally, the RuleGroupIdx was not being updated when rules were reordered in the group. Context: grafana/terraform-provider-grafana#1971 (comment) Relates to: grafana/terraform-provider-grafana#1928
|
Hopefully grafana/grafana#99858 should address the issues @JacobsonMT pointed out, but the question is then how should we merge and release this so that we can clarify that setting the |
moustafab
added a commit
to grafana/grafana
that referenced
this pull request
Feb 10, 2025
When modifying rule groups the `uid` can be specified but only if the rule already existed in the DB. If the rule is new the update would be rejected. This updates the RuleGroup provisioning apis to allow specifying the `uid` when creating/updating rule groups. Additionally, the RuleGroupIdx was not being updated when rules were reordered in the group. Context: grafana/terraform-provider-grafana#1971 (comment) Relates to: grafana/terraform-provider-grafana#1928 Fixes: #98283
moustafab
added a commit
to grafana/grafana
that referenced
this pull request
Feb 11, 2025
When modifying rule groups the `uid` can be specified but only if the rule already existed in the DB. If the rule is new the update would be rejected. This updates the RuleGroup provisioning apis to allow specifying the `uid` when creating/updating rule groups. Additionally, the RuleGroupIdx was not being updated when rules were reordered in the group. Context: grafana/terraform-provider-grafana#1971 (comment) Relates to: grafana/terraform-provider-grafana#1928 Fixes: #98283 (cherry picked from commit 7dee4d1)
moustafab
added a commit
to grafana/grafana
that referenced
this pull request
Feb 11, 2025
When modifying rule groups the `uid` can be specified but only if the rule already existed in the DB. If the rule is new the update would be rejected. This updates the RuleGroup provisioning apis to allow specifying the `uid` when creating/updating rule groups. Additionally, the RuleGroupIdx was not being updated when rules were reordered in the group. Context: grafana/terraform-provider-grafana#1971 (comment) Relates to: grafana/terraform-provider-grafana#1928 Fixes: #98283 (cherry picked from commit 7dee4d1)
aishyandapalli
pushed a commit
to aishyandapalli/grafana
that referenced
this pull request
Feb 12, 2025
…#99858) When modifying rule groups the `uid` can be specified but only if the rule already existed in the DB. If the rule is new the update would be rejected. This updates the RuleGroup provisioning apis to allow specifying the `uid` when creating/updating rule groups. Additionally, the RuleGroupIdx was not being updated when rules were reordered in the group. Context: grafana/terraform-provider-grafana#1971 (comment) Relates to: grafana/terraform-provider-grafana#1928 Fixes: grafana#98283
moustafab
added a commit
to grafana/grafana
that referenced
this pull request
Feb 12, 2025
When modifying rule groups the `uid` can be specified but only if the rule already existed in the DB. If the rule is new the update would be rejected. This updates the RuleGroup provisioning apis to allow specifying the `uid` when creating/updating rule groups. Additionally, the RuleGroupIdx was not being updated when rules were reordered in the group. Context: grafana/terraform-provider-grafana#1971 (comment) Relates to: grafana/terraform-provider-grafana#1928 Fixes: #98283 (cherry picked from commit 7dee4d1)
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.
Unfortunately this is the only viable workaround. It will require users to manually set the uid for alert rules similar to how it is done in file provisioning.
Addresses #1928