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

Added uid to AlertNotification json

Browse Source
This commit is contained in:
Pavel Bakulev 2019-01-16 16:34:32 +02:00
parent f461d52004
commit 6a8e39ba17
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/dtos/alerting.go
View File

@ -50,6 +50,7 @@ func formatShort(interval time.Duration) string {
func NewAlertNotification(notification *models.AlertNotification) *AlertNotification {
return &AlertNotification{
Id: notification.Id,
Uid: notification.Uid,
Name: notification.Name,
Type: notification.Type,
IsDefault: notification.IsDefault,
@ -64,6 +65,7 @@ func NewAlertNotification(notification *models.AlertNotification) *AlertNotifica
type AlertNotification struct {
Id int64 `json:"id"`
Uid string `json:"uid"`
Name string `json:"name"`
Type string `json:"type"`
IsDefault bool `json:"isDefault"`

2
public/app/features/alerting/AlertTabCtrl.ts
View File

@ -141,7 +141,7 @@ export class AlertTabCtrl {
iconClass: this.getNotificationIcon(model.type),
isDefault: false,
});
this.alert.notifications.push({ id: model.id });
this.alert.notifications.push({ uid: model.uid });
// reset plus button
this.addNotificationSegment.value = this.uiSegmentSrv.newPlusButton().value;