IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 15:45:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: fetch interval from stored namespace UID (#53195)

Browse Source
This commit is contained in:
Jean-Philippe Quéméner 2022-08-12 00:54:57 +02:00 committed by GitHub
parent 8c5f5e7a32
commit e14c91d5d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/ngalert/provisioning/alert_rules.go
View File

@ -276,10 +276,7 @@ func (service *AlertRuleService) UpdateAlertRule(ctx context.Context, rule model
}
rule.Updated = time.Now()
rule.ID = storedRule.ID
rule.IntervalSeconds, err = service.ruleStore.GetRuleGroupInterval(ctx, rule.OrgID, rule.NamespaceUID, rule.RuleGroup)
if err != nil {
return models.AlertRule{}, err
}
rule.IntervalSeconds = storedRule.IntervalSeconds
err = rule.SetDashboardAndPanel()
if err != nil {
return models.AlertRule{}, err

13
pkg/services/ngalert/provisioning/alert_rules_test.go
View File

@ -69,6 +69,19 @@ func TestAlertRuleService(t *testing.T) {
require.Equal(t, interval, rule.IntervalSeconds)
})
t.Run("if a folder was renamed the interval should be fetched from the renamed folder", func(t *testing.T) {
var orgID int64 = 2
rule := dummyRule("test#1", orgID)
rule.NamespaceUID = "123abc"
rule, err := ruleService.CreateAlertRule(context.Background(), rule, models.ProvenanceNone, 0)
require.NoError(t, err)
rule.NamespaceUID = "abc123"
_, err = ruleService.UpdateAlertRule(context.Background(),
rule, models.ProvenanceNone)
require.NoError(t, err)
})
t.Run("group creation should propagate group title correctly", func(t *testing.T) {
var orgID int64 = 1
group := createDummyGroup("group-test-3", orgID)