Merge pull request #174 from Gentleelephant/fix-bug-1-15

Fix bug

Author: wanjunlei

.github/workflows/build-exporter-image.yaml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'master'
+      - 'release-*'
     tags:
       - 'v*'
     paths:
@@ -12,7 +13,6 @@ on:
       - "hack/**"
       - "pkg/**"
       - "Makefile"
-
 env:
   REPO_EXPORTER: 'kubesphere'
 

pkg/exporter/sinks/stdout.go

@@ -13,11 +13,25 @@ type StdoutSinker struct {
 
 func (s *StdoutSinker) Sink(ctx context.Context, evts types.Events) error {
 	for _, evt := range evts.KubeEvents {
-		bs, err := json.Marshal(evt)
+
+		eventBytes, err := json.Marshal(evt.Event)
 		if err != nil {
 			return err
 		}
-		fmt.Println(string(bs))
+
+		var eventMap map[string]interface{}
+		if err := json.Unmarshal(eventBytes, &eventMap); err != nil {
+			return err
+		}
+
+		eventMap["cluster"] = evt.Cluster
+
+		finalBytes, err := json.Marshal(eventMap)
+		if err != nil {
+			return fmt.Errorf("failed to marshal final map: %w", err)
+		}
+
+		fmt.Println(string(finalBytes))
 	}
 	return nil
 }