github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-02-14 18:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a second container to fixture to check counts

Browse Source
This commit is contained in:
Bryan Boreham
2020-03-10 11:10:35 +00:00
parent c03aeb5d43
commit 62d4fbd94e
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
render/expected/expected.go
View File

@@ -181,6 +181,8 @@ var (
RenderedProcesses[fixture.ServerProcessNodeID],
)),
fixture.ServerContainer2NodeID: container(fixture.ServerContainer2NodeID),
uncontainedServerID: uncontainedServerNode,
render.IncomingInternetID: theIncomingInternetNode(fixture.ServerContainerNodeID),
render.OutgoingInternetID: theOutgoingInternetNode,
@@ -204,11 +206,12 @@ var (
WithLatests(map[string]string{
docker.ContainerHostname: fixture.ServerContainerHostname,
}).
AddCounter(report.Container, 1).
AddCounter(report.Container, 2).
WithChildren(report.MakeNodeSet(
RenderedEndpoints[fixture.Server80NodeID],
RenderedProcesses[fixture.ServerProcessNodeID],
RenderedContainers[fixture.ServerContainerNodeID],
RenderedContainers[fixture.ServerContainer2NodeID],
)),
uncontainedServerID: uncontainedServerNode,
@@ -236,11 +239,12 @@ var (
)),
ServerContainerImageNodeID: containerImage(ServerContainerImageNodeID).
AddCounter(report.Container, 1).
AddCounter(report.Container, 2).
WithChildren(report.MakeNodeSet(
RenderedEndpoints[fixture.Server80NodeID],
RenderedProcesses[fixture.ServerProcessNodeID],
RenderedContainers[fixture.ServerContainerNodeID],
RenderedContainers[fixture.ServerContainer2NodeID],
)),
uncontainedServerID: uncontainedServerNode,
@@ -253,7 +257,9 @@ var (
uncontainedServerNode,
RenderedEndpoints[fixture.NonContainerNodeID],
RenderedProcesses[fixture.NonContainerProcessNodeID],
RenderedContainers[fixture.ServerContainer2NodeID],
)).
AddCounter(report.Container, 1).
AddCounter(render.Pseudo, 1)
RenderedPods = report.Nodes{
@@ -364,7 +370,7 @@ var (
)),
fixture.ServerHostNodeID: hostNode(fixture.ServerHostNodeID, render.OutgoingInternetID).
AddCounter(report.Container, 1).
AddCounter(report.Container, 2).
AddCounter(report.ContainerImage, 1).
AddCounter(report.Pod, 1).
AddCounter(report.Process, 2).
@@ -374,6 +380,7 @@ var (
RenderedProcesses[fixture.ServerProcessNodeID],
RenderedProcesses[fixture.NonContainerProcessNodeID],
RenderedContainers[fixture.ServerContainerNodeID],
RenderedContainers[fixture.ServerContainer2NodeID],
RenderedContainerImages[ServerContainerImageNodeID],
RenderedPods[fixture.ServerPodNodeID],
)),

30
test/fixture/report_fixture.go
View File

@@ -71,12 +71,15 @@ var (
ServerProcessNodeID = report.MakeProcessNodeID(ServerHostID, ServerPID)
NonContainerProcessNodeID = report.MakeProcessNodeID(ServerHostID, NonContainerPID)
ClientContainerID = "a1b2c3d4e5"
ClientContainerName = "client"
ServerContainerID = "5e4d3c2b1a"
ServerContainerName = "task-name-5-server-aceb93e2f2b797caba01"
ClientContainerNodeID = report.MakeContainerNodeID(ClientContainerID)
ServerContainerNodeID = report.MakeContainerNodeID(ServerContainerID)
ClientContainerID = "a1b2c3d4e5"
ClientContainerName = "client"
ServerContainerID = "5e4d3c2b1a"
ServerContainerName = "task-name-5-server-aceb93e2f2b797caba01"
ServerContainer2ID = "1a1d30201f"
ServerContainer2Name = "task-name-6-server-8213182737"
ClientContainerNodeID = report.MakeContainerNodeID(ClientContainerID)
ServerContainerNodeID = report.MakeContainerNodeID(ServerContainerID)
ServerContainer2NodeID = report.MakeContainerNodeID(ServerContainer2ID)
TestLabelKey1 = "myrole"
ApplicationLabelValue1 = "customapplication1"
@@ -260,6 +263,21 @@ var (
docker.CPUTotalUsage: ServerContainerCPUMetric,
docker.MemoryUsage: ServerContainerMemoryMetric,
}),
// Two server containers with same hostname
ServerContainer2NodeID: report.MakeNodeWith(
ServerContainer2NodeID, map[string]string{
docker.ContainerID: ServerContainer2ID,
docker.ContainerName: ServerContainer2Name,
docker.ContainerHostname: ServerContainerHostname,
docker.ContainerState: report.StateRunning,
docker.ContainerStateHuman: report.StateRunning,
docker.ImageID: ServerContainerImageID,
report.HostNodeID: ServerHostNodeID,
}).
WithTopology(report.Container).WithParents(report.MakeSets().
Add("host", report.MakeStringSet(ServerHostNodeID)).
Add("container_image", report.MakeStringSet(ServerContainerImageNodeID))),
},
MetadataTemplates: docker.ContainerMetadataTemplates,
MetricTemplates: docker.ContainerMetricTemplates,