github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 17:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove hostID from container image node ids

Browse Source
This commit is contained in:
Paul Bellamy
2016-01-18 10:36:31 +00:00
committed by Simon Howe
parent 9e61ad37f4
commit 3cda328976
10 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
probe/docker/container.go
View File

@@ -334,7 +334,7 @@ func (c *container) GetNode(hostID string, localAddrs []net.IP) report.Node {
).WithMetrics(
c.metrics(),
).WithParents(report.Sets{
"container_image": report.MakeStringSet(report.MakeContainerImageNodeID(hostID, c.container.Image)),
"container_image": report.MakeStringSet(report.MakeContainerImageNodeID(c.container.Image)),
})
if c.container.State.Paused {

2
probe/docker/container_test.go
View File

@@ -93,7 +93,7 @@ func TestContainer(t *testing.T) {
"cpu_total_usage": report.MakeMetric(),
"memory_usage": report.MakeMetric().Add(now, 12345),
}).WithParents(report.Sets{
"container_image": report.MakeStringSet(report.MakeContainerImageNodeID("scope", "baz")),
"container_image": report.MakeStringSet(report.MakeContainerImageNodeID("baz")),
})
test.Poll(t, 100*time.Millisecond, want, func() interface{} {
node := c.GetNode("scope", []net.IP{})

4
probe/docker/reporter.go
View File

@@ -117,8 +117,6 @@ func (r *Reporter) containerImageTopology() report.Topology {
r.registry.WalkImages(func(image *docker_client.APIImages) {
nmd := report.MakeNodeWith(map[string]string{
ImageID: image.ID,
}).WithParents(report.Sets{
"host": report.MakeStringSet(report.MakeHostNodeID(r.hostID)),
})
AddLabels(nmd, image.Labels)
@@ -126,7 +124,7 @@ func (r *Reporter) containerImageTopology() report.Topology {
nmd.Metadata[ImageName] = image.RepoTags[0]
}
nodeID := report.MakeContainerImageNodeID(r.hostID, image.ID)
nodeID := report.MakeContainerImageNodeID(image.ID)
result.AddNode(nodeID, nmd)
})

4
probe/docker/reporter_test.go
View File

@@ -101,11 +101,9 @@ func TestReporter(t *testing.T) {
}
want.ContainerImage = report.Topology{
Nodes: report.Nodes{
report.MakeContainerImageNodeID("host1", "baz"): report.MakeNodeWith(map[string]string{
report.MakeContainerImageNodeID("baz"): report.MakeNodeWith(map[string]string{
docker.ImageID: "baz",
docker.ImageName: "bang",
}).WithParents(report.Sets{
"host": report.MakeStringSet(report.MakeHostNodeID("host1")),
}),
},
Controls: report.Controls{},

6
probe/docker/tagger.go
View File

@@ -23,15 +23,13 @@ var (
// nodes that have a PID.
type Tagger struct {
registry Registry
hostID string
procWalker process.Walker
}
// NewTagger returns a usable Tagger.
func NewTagger(registry Registry, hostID string, procWalker process.Walker) *Tagger {
func NewTagger(registry Registry, procWalker process.Walker) *Tagger {
return &Tagger{
registry: registry,
hostID: hostID,
procWalker: procWalker,
}
}
@@ -88,7 +86,7 @@ func (t *Tagger) tag(tree process.Tree, topology *report.Topology) {
ContainerID: c.ID(),
}).WithParents(report.Sets{
"container": report.MakeStringSet(report.MakeContainerNodeID(c.ID())),
"container_image": report.MakeStringSet(report.MakeContainerImageNodeID(t.hostID, c.Image())),
"container_image": report.MakeStringSet(report.MakeContainerImageNodeID(c.Image())),
}))
}
}

4
probe/docker/tagger_test.go
View File

@@ -42,7 +42,7 @@ func TestTagger(t *testing.T) {
docker.ContainerID: "ping",
}).WithParents(report.Sets{
"container": report.MakeStringSet(report.MakeContainerNodeID("ping")),
"container_image": report.MakeStringSet(report.MakeContainerImageNodeID("somehost.com", "baz")),
"container_image": report.MakeStringSet(report.MakeContainerImageNodeID("baz")),
})
)
@@ -54,7 +54,7 @@ func TestTagger(t *testing.T) {
want.Process.AddNode(pid1NodeID, report.MakeNodeWith(map[string]string{process.PID: "2"}).Merge(wantNode))
want.Process.AddNode(pid2NodeID, report.MakeNodeWith(map[string]string{process.PID: "3"}).Merge(wantNode))
tagger := docker.NewTagger(mockRegistryInstance, "somehost.com", nil)
tagger := docker.NewTagger(mockRegistryInstance, nil)
have, err := tagger.Tag(input)
if err != nil {
t.Errorf("%v", err)