github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-23 22:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use image name without version as id. (#1531)

Browse Source 
* Use image name without version as id.

* Review feedback
This commit is contained in:
Tom Wilkie
2016-06-15 16:14:51 +01:00
committed by GitHub
parent d888509865
commit fba555c985
13 changed files with 127 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/fixture/report_fixture.go
+3 -6
View File
@@ -217,8 +217,7 @@ var (
}).
WithTopology(report.Process).WithParents(report.EmptySets.
Add("host", report.MakeStringSet(ClientHostNodeID)).
Add("container", report.MakeStringSet(ClientContainerNodeID)).
Add("container_image", report.MakeStringSet(ClientContainerImageNodeID)),
Add("container", report.MakeStringSet(ClientContainerNodeID)),
).WithMetrics(report.Metrics{
process.CPUUsage: ClientProcess1CPUMetric,
process.MemoryUsage: ClientProcess1MemoryMetric,
@@ -231,8 +230,7 @@ var (
}).
WithTopology(report.Process).WithParents(report.EmptySets.
Add("host", report.MakeStringSet(ClientHostNodeID)).
Add("container", report.MakeStringSet(ClientContainerNodeID)).
Add("container_image", report.MakeStringSet(ClientContainerImageNodeID)),
Add("container", report.MakeStringSet(ClientContainerNodeID)),
),
ServerProcessNodeID: report.MakeNodeWith(ServerProcessNodeID, map[string]string{
process.PID: ServerPID,
@@ -242,8 +240,7 @@ var (
}).
WithTopology(report.Process).WithParents(report.EmptySets.
Add("host", report.MakeStringSet(ServerHostNodeID)).
Add("container", report.MakeStringSet(ServerContainerNodeID)).
Add("container_image", report.MakeStringSet(ServerContainerImageNodeID)),
Add("container", report.MakeStringSet(ServerContainerNodeID)),
),
NonContainerProcessNodeID: report.MakeNodeWith(NonContainerProcessNodeID, map[string]string{
process.PID: NonContainerPID,