IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-28 03:34:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Support Prometheus durations in Provisioning API (#58293)

Browse Source 
Provisioning API should support Prometheus durations
This commit is contained in:
Bart Peeters 2022-11-21 19:58:25 +01:00 committed by GitHub
parent 38f25a0bf5
commit 57d6adbc7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
View File

@ -104,10 +104,6 @@ type ProvisionedAlertRule struct {
}
func (a *ProvisionedAlertRule) UpstreamModel() (models.AlertRule, error) {
forDur, err := time.ParseDuration(a.For.String())
if err != nil {
return models.AlertRule{}, err
}
return models.AlertRule{
ID: a.ID,
UID: a.UID,
@ -120,7 +116,7 @@ func (a *ProvisionedAlertRule) UpstreamModel() (models.AlertRule, error) {
Updated: a.Updated,
NoDataState: a.NoDataState,
ExecErrState: a.ExecErrState,
For: forDur,
For: time.Duration(a.For),
Annotations: a.Annotations,
Labels: a.Labels,
}, nil

10
pkg/services/provisioning/alerting/rules_types.go
View File

@ -9,6 +9,8 @@ import (
"github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/provisioning/values"
"github.com/prometheus/common/model"
)
type RuleDelete struct {
@ -39,11 +41,11 @@ func (ruleGroupV1 *AlertRuleGroupV1) MapToModel() (AlertRuleGroup, error) {
if ruleGroup.OrgID < 1 {
ruleGroup.OrgID = 1
}
interval, err := time.ParseDuration(ruleGroupV1.Interval.Value())
interval, err := model.ParseDuration(ruleGroupV1.Interval.Value())
if err != nil {
return AlertRuleGroup{}, err
}
ruleGroup.Interval = interval
ruleGroup.Interval = time.Duration(interval)
ruleGroup.Folder = ruleGroupV1.Folder.Value()
if strings.TrimSpace(ruleGroup.Folder) == "" {
return AlertRuleGroup{}, errors.New("rule group has no folder set")
@ -91,11 +93,11 @@ func (rule *AlertRuleV1) mapToModel(orgID int64) (models.AlertRule, error) {
return models.AlertRule{}, fmt.Errorf("rule '%s' failed to parse: no UID set", alertRule.Title)
}
alertRule.OrgID = orgID
duration, err := time.ParseDuration(rule.For.Value())
duration, err := model.ParseDuration(rule.For.Value())
if err != nil {
return models.AlertRule{}, fmt.Errorf("rule '%s' failed to parse: %w", alertRule.Title, err)
}
alertRule.For = duration
alertRule.For = time.Duration(duration)
dashboardUID := rule.DashboardUID.Value()
alertRule.DashboardUID = &dashboardUID
panelID := rule.PanelID.Value()

21
pkg/services/provisioning/alerting/rules_types_test.go
View File

@ -2,6 +2,7 @@ package alerting
import (
"testing"
"time"
"github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/provisioning/values"
@ -51,6 +52,16 @@ func TestRuleGroup(t *testing.T) {
_, err = rg.MapToModel()
require.Error(t, err)
})
t.Run("a rule group with an interval containing 'd' should work", func(t *testing.T) {
rg := validRuleGroupV1(t)
var interval values.StringValue
err := yaml.Unmarshal([]byte("2d"), &interval)
require.NoError(t, err)
rg.Interval = interval
rgMapped, err := rg.MapToModel()
require.NoError(t, err)
require.Equal(t, 48*time.Hour, rgMapped.Interval)
})
t.Run("a rule group with an empty org id should default to 1", func(t *testing.T) {
rg := validRuleGroupV1(t)
rg.OrgID = values.Int64Value{}
@ -103,6 +114,16 @@ func TestRules(t *testing.T) {
_, err = rule.mapToModel(1)
require.Error(t, err)
})
t.Run("a rule with a for duration containing 'd' should work", func(t *testing.T) {
rule := validRuleV1(t)
forDuration := values.StringValue{}
err := yaml.Unmarshal([]byte("2d"), &forDuration)
rule.For = forDuration
require.NoError(t, err)
ruleMapped, err := rule.mapToModel(1)
require.NoError(t, err)
require.Equal(t, 48*time.Hour, ruleMapped.For)
})
t.Run("a rule with out a condition should error", func(t *testing.T) {
rule := validRuleV1(t)
rule.Condition = values.StringValue{}