Merge pull request #78 from dhruv0000/enhance/log-streaming

Added primary and secondary refs for logs
meshery · Jul 9, 2021 · e668138 · e668138
2 parents bd05fc2 + 48ca0c0
commit e668138
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/meshsync/logstream.go b/meshsync/logstream.go
@@ -83,8 +83,10 @@ func (h *Handler) streamLogs(id string, req model.LogRequest, cfg config.Listene
 			ObjectType: broker.LogStreamObject,
 			EventType:  broker.Add,
 			Object: &model.LogObject{
-				ID:   req.ID,
-				Data: message,
+				ID:        req.ID,
+				Data:      message,
+				Primary:   req.Name,
+				Secondary: req.Container,
 			},
 		})
 		if err != nil {

diff --git a/pkg/model/log.go b/pkg/model/log.go
@@ -3,6 +3,12 @@ package model
 type LogObject struct {
 	ID   string `json:"id,omitempty"`
 	Data string `json:"data,omitempty"`
+
+	// Name of Pod, Svc, Deply getting logs for
+	Primary string `json:"primary,omitempty"`
+
+	// Specific detail about the log like Container or Pod Name
+	Secondary string `json:"secondary,omitempty"`
 }
 
 type LogRequest struct {