IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Also clear fields in model/store validation for recording rules (#93506)

Browse Source 
* Fix model validation

* Remove validation from provisioning service
This commit is contained in:
William Wernert 2024-09-19 17:27:37 -04:00 committed by GitHub
parent 9a40e8dca6
commit f1ba7deff5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/services/ngalert/models/alert_rule.go
View File

@ -610,9 +610,20 @@ func validateRecordingRuleFields(rule *AlertRule) error {
if !prommodels.IsValidMetricName(metricName) {
return fmt.Errorf("%w: %s", ErrAlertRuleFailedValidation, "metric name for recording rule must be a valid Prometheus metric name")
}
clearRecordingRuleIgnoredFields(rule)
return nil
}
func clearRecordingRuleIgnoredFields(rule *AlertRule) {
rule.NoDataState = ""
rule.ExecErrState = ""
rule.Condition = ""
rule.For = 0
rule.NotificationSettings = nil
}
func (alertRule *AlertRule) ResourceType() string {
return "alertRule"
}

18
pkg/services/ngalert/store/alert_rule_test.go
View File

@ -747,6 +747,24 @@ func TestIntegrationInsertAlertRules(t *testing.T) {
})
})
t.Run("clears fields that should not exist on recording rules", func(t *testing.T) {
rule := recordingRulesGen.Generate()
rules, err := store.InsertAlertRules(context.Background(), []models.AlertRule{rule})
require.NoError(t, err)
require.Len(t, rules, 1)
ruleUID := rules[0].UID
savedRule, err := store.GetAlertRuleByUID(context.Background(), &models.GetAlertRuleByUIDQuery{
OrgID: orgID,
UID: ruleUID,
})
require.NoError(t, err)
require.Equal(t, "", savedRule.Condition)
require.Equal(t, models.NoDataState(""), savedRule.NoDataState)
require.Equal(t, models.ExecutionErrorState(""), savedRule.ExecErrState)
require.Zero(t, savedRule.For)
require.Nil(t, savedRule.NotificationSettings)
})
t.Run("fail to insert rules with same ID", func(t *testing.T) {
_, err = store.InsertAlertRules(context.Background(), []models.AlertRule{rules[0]})
require.ErrorIs(t, err, models.ErrAlertRuleConflictBase)