github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-05 19:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore docker tagging to the endpoint topology until we have the docker images topology.

Browse Source
This commit is contained in:
Tom Wilkie
2015-06-17 17:29:37 +00:00
parent 18c544701a
commit f30539601d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
probe/tag/docker_tagger.go
View File

@@ -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