Merge pull request #12366 from zhaoxiangchun/feature/zxc-monitor_sheild_master

fix(monitor): alert record details add trigger_time field

pkg/apis/monitor/alertrecord.go

@@ -14,7 +14,11 @@
 
 package monitor
 
-import "yunion.io/x/onecloud/pkg/apis"
+import (
+	"time"
+
+	"yunion.io/x/onecloud/pkg/apis"
+)
 
 const (
 	SEND_STATE_OK     = "ok"
@@ -41,8 +45,9 @@ type AlertRecordDetails struct {
 	apis.StatusStandaloneResourceDetails
 	apis.ScopedResourceBaseInfo
 
-	ResNum    int64  `json:"res_num"`
-	AlertName string `json:"alert_name"`
+	ResNum      int64  `json:"res_num"`
+	AlertName   string `json:"alert_name"`
+	TriggerTime time.Time
 }
 
 type AlertRecordCreateInput struct {

pkg/monitor/models/alertrecord.go

@@ -247,6 +247,7 @@ func (record *SAlertRecord) GetMoreDetails(out monitor.AlertRecordDetails) (moni
 	if commonAlert != nil {
 		out.AlertName = commonAlert.GetName()
 	}
+	out.TriggerTime = record.CreatedAt
 	return out, nil
 }