Modify alert structure and inherit scoperesource

yunionio · Jun 21, 2020 · f20a87a · f20a87a
1 parent 6c66185
commit f20a87a
Show file tree

Hide file tree

Showing 18 changed files with 440 additions and 125 deletions.
diff --git a/pkg/apis/compute/zz_generated.model.go b/pkg/apis/compute/zz_generated.model.go
diff --git a/pkg/apis/identity/zz_generated.model.go b/pkg/apis/identity/zz_generated.model.go
diff --git a/pkg/apis/image/zz_generated.model.go b/pkg/apis/image/zz_generated.model.go
diff --git a/pkg/apis/monitor/alert.go b/pkg/apis/monitor/alert.go
@@ -120,7 +120,7 @@ type AlertCreateInput struct {
 }
 
 type AlertUpdateInput struct {
-	apis.VirtualResourceBaseUpdateInput
+	apis.StandaloneResourceBaseUpdateInput
 
 	Message *string `json:"message"`
 
@@ -139,15 +139,16 @@ type AlertUpdateInput struct {
 }
 
 type AlertListInput struct {
-	apis.VirtualResourceListInput
+	apis.ScopedResourceBaseListInput
 	apis.EnabledResourceBaseListInput
-
+	apis.StatusStandaloneResourceListInput
 	// 以报警是否启用/禁用过滤列表
 	// Enabled *bool `json:"enabled"`
 }
 
 type AlertDetails struct {
-	apis.VirtualResourceDetails
+	apis.StatusStandaloneResourceDetails
+	apis.ScopedResourceBaseInfo
 }
 
 type AlertTestRunInput struct {

diff --git a/pkg/apis/monitor/alertnotification.go b/pkg/apis/monitor/alertnotification.go
@@ -21,7 +21,7 @@ import (
 )
 
 type AlertJointResourceBaseDetails struct {
-	apis.VirtualJointResourceBaseDetails
+	apis.JointResourceBaseDetails
 	SAlertJointsBase
 	Alert string `json:"alert"`
 }