public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alerting: allow custom UID for contact points through API (#50089) (#50143)

Browse Source 
* Alerting: allow custom UID for contact points through API

* fix auth

(cherry picked from commit 468ed68d64)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
This commit is contained in:
Grot (@grafanabot)
2022-06-03 10:45:33 +02:00
committed by GitHub
co-authored by Jean-Philippe Quéméner
parent 742abc8129
commit ccee1f7f18
8 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/api/api_provisioning.go
+3 -5
View File
@@ -18,7 +18,6 @@ import (
const (
namePathParam = ":name"
idPathParam = ":ID"
uidPathParam = ":UID"
groupPathParam = ":Group"
folderUIDPathParam = ":FolderUID"
@@ -111,8 +110,7 @@ func (srv *ProvisioningSrv) RoutePostContactPoint(c *models.ReqContext, cp apimo
}
func (srv *ProvisioningSrv) RoutePutContactPoint(c *models.ReqContext, cp apimodels.EmbeddedContactPoint) response.Response {
id := pathParam(c, idPathParam)
cp.UID = id
cp.UID = pathParam(c, uidPathParam)
err := srv.contactPointService.UpdateContactPoint(c.Req.Context(), c.OrgId, cp, alerting_models.ProvenanceAPI)
if err != nil {
return ErrResp(http.StatusInternalServerError, err, "")
@@ -121,8 +119,8 @@ func (srv *ProvisioningSrv) RoutePutContactPoint(c *models.ReqContext, cp apimod
}
func (srv *ProvisioningSrv) RouteDeleteContactPoint(c *models.ReqContext) response.Response {
cpID := pathParam(c, idPathParam)
err := srv.contactPointService.DeleteContactPoint(c.Req.Context(), c.OrgId, cpID)
UID := pathParam(c, uidPathParam)
err := srv.contactPointService.DeleteContactPoint(c.Req.Context(), c.OrgId, UID)
if err != nil {
return ErrResp(http.StatusInternalServerError, err, "")
}