From f30539601db2107295d6d1a31ea15d95dd068728 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 17 Jun 2015 17:29:37 +0000 Subject: [PATCH] Restore docker tagging to the endpoint topology until we have the docker images topology. --- probe/tag/docker_tagger.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/probe/tag/docker_tagger.go b/probe/tag/docker_tagger.go index 99fa0b7ad..8455818a4 100644 --- a/probe/tag/docker_tagger.go +++ b/probe/tag/docker_tagger.go @@ -271,7 +271,13 @@ func (t *DockerTagger) Containers() []*docker.Container { // Tag implements Tagger. func (t *DockerTagger) Tag(r report.Report) report.Report { - for nodeID, nodeMetadata := range r.Process.NodeMetadatas { + t.tag(&r.Process) + t.tag(&r.Endpoint) + return r +} + +func (t *DockerTagger) tag(topology *report.Topology) { + for nodeID, nodeMetadata := range topology.NodeMetadatas { pidStr, ok := nodeMetadata["pid"] if !ok { //log.Printf("dockerTagger: %q: no process node ID", id) @@ -318,10 +324,8 @@ func (t *DockerTagger) Tag(r report.Report) report.Report { md[ImageName] = image.RepoTags[0] } - r.Process.NodeMetadatas[nodeID].Merge(md) + topology.NodeMetadatas[nodeID].Merge(md) } - - return r } // ContainerTopology produces a Toplogy of Containers