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: decouple api models from domain\dto models: separate Provenance status + converters (#63594)

Browse Source 
* move conversions of domain models to api models and reverse from definition package to api package
This commit is contained in:
Yuri Tseretyan
2023-02-27 17:57:15 -05:00
committed by GitHub
parent dc01e1ee6a
commit f561e71de8
21 changed files with 182 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/provisioning/alerting/mute_times_provisioner.go
View File

@@ -42,7 +42,7 @@ func (c *defaultMuteTimesProvisioner) Provision(ctx context.Context,
cache[muteTiming.OrgID][interval.Name] = interval
}
}
muteTiming.MuteTime.Provenance = models.ProvenanceFile
muteTiming.MuteTime.Provenance = definitions.Provenance(models.ProvenanceFile)
if _, exists := cache[muteTiming.OrgID][muteTiming.MuteTime.Name]; exists {
_, err := c.muteTimingService.UpdateMuteTiming(ctx, muteTiming.MuteTime, muteTiming.OrgID)
if err != nil {

3
pkg/services/provisioning/alerting/text_templates.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
"github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
)
@@ -30,7 +31,7 @@ func (c *defaultTextTemplateProvisioner) Provision(ctx context.Context,
files []*AlertingFile) error {
for _, file := range files {
for _, template := range file.Templates {
template.Data.Provenance = models.ProvenanceFile
template.Data.Provenance = definitions.Provenance(models.ProvenanceFile)
_, err := c.templateService.SetTemplate(ctx, template.OrgID, template.Data)
if err != nil {
return err