make nodeSummaryGroupSpecs only include what's needed

This commit is contained in:
Matthias Radestock
2017-06-21 18:24:14 +01:00
parent b6c886e0d1
commit ae2a5edc18

View File

@@ -8,7 +8,6 @@ import (
"github.com/weaveworks/scope/probe/awsecs"
"github.com/weaveworks/scope/probe/docker"
"github.com/weaveworks/scope/probe/host"
"github.com/weaveworks/scope/probe/kubernetes"
"github.com/weaveworks/scope/probe/process"
"github.com/weaveworks/scope/report"
@@ -126,30 +125,12 @@ func controls(r report.Report, n report.Node) []ControlInstance {
return []ControlInstance{}
}
// We only need to include topologies here where the nodes may appear
// as children of other nodes in some topology.
var nodeSummaryGroupSpecs = []struct {
topologyID string
NodeSummaryGroup
}{
{
topologyID: report.Host,
NodeSummaryGroup: NodeSummaryGroup{
Label: "Hosts",
Columns: []Column{
{ID: host.CPUUsage, Label: "CPU", Datatype: "number"},
{ID: host.MemoryUsage, Label: "Memory", Datatype: "number"},
},
},
},
{
topologyID: report.Service,
NodeSummaryGroup: NodeSummaryGroup{
Label: "Services",
Columns: []Column{
{ID: report.Pod, Label: "# Pods", Datatype: "number"},
{ID: kubernetes.IP, Label: "IP", Datatype: "ip"},
},
},
},
{
topologyID: report.ReplicaSet,
NodeSummaryGroup: NodeSummaryGroup{
@@ -172,16 +153,6 @@ var nodeSummaryGroupSpecs = []struct {
},
},
},
{
topologyID: report.ECSService,
NodeSummaryGroup: NodeSummaryGroup{
Label: "Services",
Columns: []Column{
{ID: awsecs.ServiceRunningCount, Label: "Running", Datatype: "number"},
{ID: awsecs.ServiceDesiredCount, Label: "Desired", Datatype: "number"},
},
},
},
{
topologyID: report.ECSTask,
NodeSummaryGroup: NodeSummaryGroup{