github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #941 from weaveworks/reorder-children-tables

Browse Source 
Reorder the children tables in the details panel
This commit is contained in:
Paul Bellamy
2016-02-10 11:40:25 +00:00
parent 8ba5a055a7 1b554baa91
commit 78d7e29437
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
render/detailed/node.go
View File

@@ -85,9 +85,9 @@ var (
}{
{report.Host, NodeSummaryGroup{TopologyID: "hosts", Label: "Hosts", Columns: []string{host.CPUUsage, host.MemoryUsage}}},
{report.Pod, NodeSummaryGroup{TopologyID: "pods", Label: "Pods", Columns: []string{}}},
{report.ContainerImage, NodeSummaryGroup{TopologyID: "containers-by-image", Label: "Container Images", Columns: []string{render.ContainersKey}}},
{report.Container, NodeSummaryGroup{TopologyID: "containers", Label: "Containers", Columns: []string{docker.CPUTotalUsage, docker.MemoryUsage}}},
{report.Process, NodeSummaryGroup{TopologyID: "processes", Label: "Processes", Columns: []string{process.PID, process.CPUUsage, process.MemoryUsage}}},
{report.ContainerImage, NodeSummaryGroup{TopologyID: "containers-by-image", Label: "Container Images", Columns: []string{render.ContainersKey}}},
}
)

12
render/detailed/node_test.go
View File

@@ -82,12 +82,6 @@ func TestMakeDetailedHostNode(t *testing.T) {
Pseudo: false,
Controls: []detailed.ControlInstance{},
Children: []detailed.NodeSummaryGroup{
{
Label: "Container Images",
TopologyID: "containers-by-image",
Columns: []string{render.ContainersKey},
Nodes: []detailed.NodeSummary{containerImageNodeSummary},
},
{
Label: "Containers",
TopologyID: "containers",
@@ -100,6 +94,12 @@ func TestMakeDetailedHostNode(t *testing.T) {
Columns: []string{process.PID, process.CPUUsage, process.MemoryUsage},
Nodes: []detailed.NodeSummary{process1NodeSummary, process2NodeSummary},
},
{
Label: "Container Images",
TopologyID: "containers-by-image",
Columns: []string{render.ContainersKey},
Nodes: []detailed.NodeSummary{containerImageNodeSummary},
},
},
}
if !reflect.DeepEqual(want, have) {