From 1b4b1af9b7073b4f86caaba554cdd00ca734fd13 Mon Sep 17 00:00:00 2001 From: Yuri Tseretyan Date: Mon, 29 Jul 2024 15:55:49 -0400 Subject: [PATCH] Alerting: Receiver API to use same logic for calculating UID as backend serivce (#91153) use same logic for calculating uID as backend serivce --- .../apis/alerting/notifications/receiver/conversions.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/registry/apis/alerting/notifications/receiver/conversions.go b/pkg/registry/apis/alerting/notifications/receiver/conversions.go index 62da13ada3d..81fe6f96501 100644 --- a/pkg/registry/apis/alerting/notifications/receiver/conversions.go +++ b/pkg/registry/apis/alerting/notifications/receiver/conversions.go @@ -3,7 +3,6 @@ package receiver import ( "encoding/json" "fmt" - "hash/fnv" "github.com/prometheus/alertmanager/config" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -13,12 +12,11 @@ import ( "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "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/notifier/legacy_storage" ) func getUID(t definitions.GettableApiReceiver) string { - sum := fnv.New64() - _, _ = sum.Write([]byte(t.Name)) - return fmt.Sprintf("%016x", sum.Sum64()) + return legacy_storage.NameToUid(t.Name) } func convertToK8sResources(orgID int64, receivers []definitions.GettableApiReceiver, namespacer request.NamespaceMapper) (*model.ReceiverList, error) {