add more infos to events

api/events.go

@@ -17,7 +17,16 @@ type eventsHandler struct {
 
 func (eh *eventsHandler) Handle(e *cluster.Event) error {
 	eh.RLock()
-	str := fmt.Sprintf("{%q:%q,%q:%q,%q:%q,%q:%d}", "status", e.Status, "id", e.Id, "from", e.From+" node:"+e.NodeName, "time", e.Time)
+
+	str := fmt.Sprintf("{%q:%q,%q:%q,%q:%q,%q:%d,%q:%q,%q:%q,%q:%q,%q:%q}",
+		"status", e.Status,
+		"id", e.Id,
+		"from", e.From+" node:"+e.NodeName,
+		"time", e.Time,
+		"node_name", e.NodeName,
+		"node_id", e.NodeID,
+		"node_addr", e.NodeAddr,
+		"node_ip", e.NodeIP)
 
 	for key, w := range eh.ws {
 		if _, err := fmt.Fprintf(w, str); err != nil {

cluster/event.go

@@ -6,6 +6,9 @@ type Event struct {
 	dockerclient.Event
 
 	NodeName string
+	NodeID   string
+	NodeAddr string
+	NodeIP   string
 }
 
 type EventHandler interface {

cluster/node.go

@@ -340,7 +340,12 @@ func (n *Node) handler(ev *dockerclient.Event, args ...interface{}) {
 		return
 	}
 
-	event := &Event{NodeName: n.Name}
+	event := &Event{
+		NodeName: n.Name,
+		NodeID:   n.ID,
+		NodeAddr: n.Addr,
+		NodeIP:   n.IP,
+	}
 	event.Event = *ev
 
 	n.eventHandler.Handle(event)