添加

Author: yumaojun03

bus/event/event.go

@@ -16,8 +16,9 @@ import (
 func NewEvent() *Event {
 	return &Event{
 		Header: Header{
-			ID:   xid.New().String(),
-			Time: ftime.Now(),
+			ID:    xid.New().String(),
+			Time:  ftime.Now(),
+			Label: make(map[string]string),
 		},
 	}
 }
@@ -54,7 +55,8 @@ type Body struct {
 	Reason       string      `bson:"reason" json:"reason,omitempty"`     // 触发原因, 比如 创建/删除/绑定/告警/恢复
 	Message      string      `bson:"message" json:"message,omitempty"`   // 事件消息,
 	ResourceType string      `bson:"resource_type" json:"resource_type"` // 资源类型,
-	ResourceUUID string      `bson:"resource_uuid" json:"resource_uuid"` // 资源UUID,
+	ResourceUUID string      `bson:"resource_uuid" json:"resource_uuid"` // 资源UUID
+	ResourceName string      `bson:"resource_name" json:"resource_name"` // 资源名称
 	Data         interface{} `bson:"data" json:"data,omitempty"`         // 事件具体数据
 }
 

http/response/event.go

@@ -1,5 +1,9 @@
 package response
 
+import (
+	"github.com/infraboard/mcube/bus/event"
+)
+
 // ResourceEvent 资源事件
 type ResourceEvent interface {
 	ResourceType() string
@@ -8,4 +12,17 @@ type ResourceEvent interface {
 	ResourceNamespace() string
 	ResourceName() string
 	ResourceAction() string
+	ResourceData() interface{}
+}
+
+func newEvent(re ResourceEvent) *event.Event {
+	e := event.NewEvent()
+	e.ResourceType = re.ResourceType()
+	e.ResourceUUID = re.ResourceUUID()
+	e.ResourceName = re.ResourceName()
+	e.Label["domain"] = re.ResourceDomain()
+	e.Label["namespace"] = re.ResourceNamespace()
+	e.Reason = re.ResourceAction()
+	e.Data = re.ResourceData()
+	return e
 }

http/response/reporter.go

@@ -2,7 +2,6 @@ package response
 
 import (
 	"github.com/infraboard/mcube/bus"
-	"github.com/infraboard/mcube/bus/event"
 	"github.com/infraboard/mcube/logger"
 	"github.com/infraboard/mcube/logger/zap"
 )
@@ -36,6 +35,12 @@ func sendEvent(re ResourceEvent) {
 		return
 	}
 
-	e := event.NewEvent()
-	eReporter.Pub("xxx", e)
+	if err := eReporter.Pub("xxx", newEvent(re)); err != nil {
+		getLog().Errorf("send event error, %s", err)
+		return
+	}
+
+	getLog().Debugf("send event[%s-%s-%s: %s] success",
+		re.ResourceDomain, re.ResourceNamespace,
+		re.ResourceName, re.ResourceAction)
 }