Added container-ip to process list

Author: ewoutp

service/runner.go

@@ -20,6 +20,8 @@ type Process interface {
 	ProcessID() int
 	// ContainerID returns the ID of the docker container that runs the process.
 	ContainerID() string
+	// ContainerIP returns the IP address of the docker container that runs the process.
+	ContainerIP() string
 
 	// Wait until the process has terminated
 	Wait()

service/runner_docker.go

@@ -308,6 +308,14 @@ func (p *dockerContainer) ContainerID() string {
 	return p.container.ID
 }
 
+// ContainerIP returns the IP address of the docker container that runs the process.
+func (p *dockerContainer) ContainerIP() string {
+	if ns := p.container.NetworkSettings; ns != nil {
+		return ns.IPAddress
+	}
+	return ""
+}
+
 func (p *dockerContainer) Wait() {
 	p.client.WaitContainer(p.container.ID)
 }

service/runner_process.go

@@ -62,6 +62,11 @@ func (p *process) ContainerID() string {
 	return ""
 }
 
+// ContainerIP returns the IP address of the docker container that runs the process.
+func (p *process) ContainerIP() string {
+	return ""
+}
+
 func (p *process) Wait() {
 	proc := p.cmd.Process
 	if proc != nil {

service/server.go

@@ -37,6 +37,7 @@ type ServerProcess struct {
 	Port        int    `json:"port"`                   // Port needed to reach the server
 	ProcessID   int    `json:"pid,omitempty"`          // PID of the process (0 when running in docker)
 	ContainerID string `json:"container-id,omitempty"` // ID of docker container running the server
+	ContainerIP string `json:"container-ip,omitempty"` // IP address of docker container running the server
 }
 
 // startHTTPServer initializes and runs the HTTP server.
@@ -236,6 +237,7 @@ func (s *Service) processListHandler(w http.ResponseWriter, r *http.Request) {
 				Port:        s.MasterPort + portOffset + portOffsetAgent,
 				ProcessID:   p.ProcessID(),
 				ContainerID: p.ContainerID(),
+				ContainerIP: p.ContainerIP(),
 			})
 		}
 		if p := s.servers.coordinatorProc; p != nil {
@@ -245,6 +247,7 @@ func (s *Service) processListHandler(w http.ResponseWriter, r *http.Request) {
 				Port:        s.MasterPort + portOffset + portOffsetCoordinator,
 				ProcessID:   p.ProcessID(),
 				ContainerID: p.ContainerID(),
+				ContainerIP: p.ContainerIP(),
 			})
 		}
 		if p := s.servers.dbserverProc; p != nil {
@@ -254,6 +257,7 @@ func (s *Service) processListHandler(w http.ResponseWriter, r *http.Request) {
 				Port:        s.MasterPort + portOffset + portOffsetDBServer,
 				ProcessID:   p.ProcessID(),
 				ContainerID: p.ContainerID(),
+				ContainerIP: p.ContainerIP(),
 			})
 		}
 	}