From ae2a5edc18f5416b11f587757d6696e0605c889d Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 21 Jun 2017 18:24:14 +0100 Subject: [PATCH] make nodeSummaryGroupSpecs only include what's needed --- render/detailed/node.go | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/render/detailed/node.go b/render/detailed/node.go index 96bac53aa..5164bc5b8 100644 --- a/render/detailed/node.go +++ b/render/detailed/node.go @@ -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{