Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't show container count in host detail panel image list #2682

Merged
merged 2 commits into from
Jul 5, 2017
+8 −12
Merged

don't show container count in host detail panel image list #2682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0fb2e1
cosmetic(ish)
rade Jul 5, 2017
0f4d17d
don't show container count in host detail panel image list
rade Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions render/detailed/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ var nodeSummaryGroupSpecs = []struct {
topologyID: report.Pod,
NodeSummaryGroup: NodeSummaryGroup{
Label: "Pods",

Columns: []Column{
{ID: kubernetes.State, Label: "State"},
{ID: report.Container, Label: "# Containers", Datatype: "number"},
Expand All @@ -155,7 +154,8 @@ var nodeSummaryGroupSpecs = []struct {
{
topologyID: report.Container,
NodeSummaryGroup: NodeSummaryGroup{
Label: "Containers", Columns: []Column{
Label: "Containers",
Columns: []Column{
{ID: docker.CPUTotalUsage, Label: "CPU", Datatype: "number"},
{ID: docker.MemoryUsage, Label: "Memory", Datatype: "number"},
},
Expand All @@ -164,7 +164,8 @@ var nodeSummaryGroupSpecs = []struct {
{
topologyID: report.Process,
NodeSummaryGroup: NodeSummaryGroup{
Label: "Processes", Columns: []Column{
Label: "Processes",
Columns: []Column{
{ID: process.PID, Label: "PID", Datatype: "number"},
{ID: process.CPUUsage, Label: "CPU", Datatype: "number"},
{ID: process.MemoryUsage, Label: "Memory", Datatype: "number"},
Expand All @@ -174,11 +175,8 @@ var nodeSummaryGroupSpecs = []struct {
{
topologyID: report.ContainerImage,
NodeSummaryGroup: NodeSummaryGroup{
TopologyID: "containers-by-image",
Label: "Container Images",
Columns: []Column{
{ID: report.Container, Label: "# Containers", DefaultSort: true, Datatype: "number"},
},
Label: "Container Images",
Columns: []Column{},
},
},
}
Expand Down
6 changes: 2 additions & 4 deletions render/detailed/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,8 @@ func TestMakeDetailedHostNode(t *testing.T) {
{
Label: "Container Images",
TopologyID: "containers-by-image",
Columns: []detailed.Column{
{ID: report.Container, Label: "# Containers", DefaultSort: true, Datatype: "number"},
},
Nodes: []detailed.NodeSummary{containerImageNodeSummary},
Columns: []detailed.Column{},
Nodes: []detailed.NodeSummary{containerImageNodeSummary},
},
},
Connections: []detailed.ConnectionsSummary{
Expand Down