From 9e9d72d3ca9913c0f5d158c7d2f6d70e8cbba2a5 Mon Sep 17 00:00:00 2001
From: zhaoxiangchun <1422928955@qq.com>
Date: Wed, 8 Sep 2021 17:36:56 +0800
Subject: [PATCH] fix(monitor): add monitor resource details field

---
 pkg/apis/monitor/monitor_resource.go   | 3 +++
 pkg/monitor/models/modelset.go         | 1 +
 pkg/monitor/models/monitor_resource.go | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/pkg/apis/monitor/monitor_resource.go b/pkg/apis/monitor/monitor_resource.go
index 961ee6bcbe..62069c11a8 100644
--- a/pkg/apis/monitor/monitor_resource.go
+++ b/pkg/apis/monitor/monitor_resource.go
@@ -33,6 +33,9 @@ type MonitorResourceListInput struct {
 type MonitorResourceDetails struct {
 	apis.VirtualResourceDetails
 	compute.CloudregionResourceInfo
+	compute.CloudaccountResourceInfo
+	Ips      string `json:"ips"`
+	AccessIp string `json:"access_ip"`
 
 	AttachAlertCount int64 `json:"attach_alert_count"`
 }
diff --git a/pkg/monitor/models/modelset.go b/pkg/monitor/models/modelset.go
index 4cf4fb7440..49fb8fbf39 100644
--- a/pkg/monitor/models/modelset.go
+++ b/pkg/monitor/models/modelset.go
@@ -58,6 +58,7 @@ type Details struct {
 	Brand         string
 	DomainId      string
 	ProjectDomain string
+	Ips           string
 }
 type Guest struct {
 	compute_models.SGuest
diff --git a/pkg/monitor/models/monitor_resource.go b/pkg/monitor/models/monitor_resource.go
index f759262f3b..44674a1eb8 100644
--- a/pkg/monitor/models/monitor_resource.go
+++ b/pkg/monitor/models/monitor_resource.go
@@ -295,6 +295,10 @@ func (self *SMonitorResource) getMoreDetails(out monitor.MonitorResourceDetails)
 	if err != nil {
 		log.Errorf("getMoreDetails err:%v", err)
 	}
+	_, object := MonitorResourceManager.GetResourceObj(self.ResId)
+	if object != nil {
+		object.Unmarshal(&out)
+	}
 	out.AttachAlertCount = int64(len(joints))
 	return out
 }