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: Update alerting package and imports from cluster and clusterpb (#79786)

Browse Source 
* Alerting: Update alerting package

* update to latest commit

* alias for imports
This commit is contained in:
Santiago
2023-12-21 12:34:48 +01:00
committed by GitHub
parent c1c3e9387a
commit c46da8ea9b
7 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/ngalert/notifier/file_store.go
View File

@@ -7,8 +7,8 @@ import (
"os"
"path/filepath"
alertingClusterPB "github.com/grafana/alerting/cluster/clusterpb"
alertingNotify "github.com/grafana/alerting/notify"
"github.com/prometheus/alertmanager/cluster/clusterpb"
"github.com/grafana/grafana/pkg/infra/kvstore"
"github.com/grafana/grafana/pkg/infra/log"
@@ -77,7 +77,7 @@ func (fileStore *FileStore) GetFullState(ctx context.Context, filenames ...strin
return "", fmt.Errorf("no values for org %d", fileStore.orgID)
}
var parts []clusterpb.Part
var parts []alertingClusterPB.Part
for _, f := range filenames {
v, ok := keys[f]
if !ok {
@@ -88,10 +88,10 @@ func (fileStore *FileStore) GetFullState(ctx context.Context, filenames ...strin
if err != nil {
return "", fmt.Errorf("error decoding value for key %q", f)
}
parts = append(parts, clusterpb.Part{Key: f, Data: b})
parts = append(parts, alertingClusterPB.Part{Key: f, Data: b})
}
fs := clusterpb.FullState{
fs := alertingClusterPB.FullState{
Parts: parts,
}
b, err := fs.Marshal()