Browse Source

Added uid to AlertNotification json

Pavel Bakulev 7 years ago
parent
commit
6a8e39ba17
2 changed files with 3 additions and 1 deletions
  1. 2 0
      pkg/api/dtos/alerting.go
  2. 1 1
      public/app/features/alerting/AlertTabCtrl.ts

+ 2 - 0
pkg/api/dtos/alerting.go

@@ -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"`

+ 1 - 1
public/app/features/alerting/AlertTabCtrl.ts

@@ -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;