From b6c886e0d12e2f8dc4622f16f84630c41d7a6ecf Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 21 Jun 2017 18:19:10 +0100 Subject: [PATCH 1/2] cosmetic --- render/detailed/node.go | 154 ++++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 78 deletions(-) diff --git a/render/detailed/node.go b/render/detailed/node.go index fb24f09e89..96bac53aa5 100644 --- a/render/detailed/node.go +++ b/render/detailed/node.go @@ -126,103 +126,101 @@ func controls(r report.Report, n report.Node) []ControlInstance { return []ControlInstance{} } -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"}, - }, +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.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{ - Label: "Replica Sets", - Columns: []Column{ - {ID: report.Pod, Label: "# Pods", Datatype: "number"}, - {ID: kubernetes.ObservedGeneration, Label: "Observed Gen.", Datatype: "number"}, - }, + }, + { + topologyID: report.ReplicaSet, + NodeSummaryGroup: NodeSummaryGroup{ + Label: "Replica Sets", + Columns: []Column{ + {ID: report.Pod, Label: "# Pods", Datatype: "number"}, + {ID: kubernetes.ObservedGeneration, Label: "Observed Gen.", Datatype: "number"}, }, }, - { - topologyID: report.Pod, - NodeSummaryGroup: NodeSummaryGroup{ - Label: "Pods", + }, + { + topologyID: report.Pod, + NodeSummaryGroup: NodeSummaryGroup{ + Label: "Pods", - Columns: []Column{ - {ID: kubernetes.State, Label: "State"}, - {ID: report.Container, Label: "# Containers", Datatype: "number"}, - {ID: kubernetes.IP, Label: "IP", Datatype: "ip"}, - }, + Columns: []Column{ + {ID: kubernetes.State, Label: "State"}, + {ID: report.Container, Label: "# Containers", Datatype: "number"}, + {ID: kubernetes.IP, Label: "IP", Datatype: "ip"}, }, }, - { - 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.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{ - Label: "Tasks", - Columns: []Column{ - {ID: awsecs.CreatedAt, Label: "Created At", Datatype: "datetime"}, - }, + }, + { + topologyID: report.ECSTask, + NodeSummaryGroup: NodeSummaryGroup{ + Label: "Tasks", + Columns: []Column{ + {ID: awsecs.CreatedAt, Label: "Created At", Datatype: "datetime"}, }, }, - { - topologyID: report.Container, - NodeSummaryGroup: NodeSummaryGroup{ - Label: "Containers", Columns: []Column{ - {ID: docker.CPUTotalUsage, Label: "CPU", Datatype: "number"}, - {ID: docker.MemoryUsage, Label: "Memory", Datatype: "number"}, - }, + }, + { + topologyID: report.Container, + NodeSummaryGroup: NodeSummaryGroup{ + Label: "Containers", Columns: []Column{ + {ID: docker.CPUTotalUsage, Label: "CPU", Datatype: "number"}, + {ID: docker.MemoryUsage, Label: "Memory", Datatype: "number"}, }, }, - { - topologyID: report.Process, - NodeSummaryGroup: NodeSummaryGroup{ - 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"}, - }, + }, + { + topologyID: report.Process, + NodeSummaryGroup: NodeSummaryGroup{ + 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"}, }, }, - { - topologyID: report.ContainerImage, - NodeSummaryGroup: NodeSummaryGroup{ - TopologyID: "containers-by-image", - Label: "Container Images", - Columns: []Column{ - {ID: report.Container, Label: "# Containers", DefaultSort: true, Datatype: "number"}, - }, + }, + { + topologyID: report.ContainerImage, + NodeSummaryGroup: NodeSummaryGroup{ + TopologyID: "containers-by-image", + Label: "Container Images", + Columns: []Column{ + {ID: report.Container, Label: "# Containers", DefaultSort: true, Datatype: "number"}, }, }, - } -) + }, +} func children(r report.Report, n report.Node) []NodeSummaryGroup { summaries := map[string][]NodeSummary{} From ae2a5edc18f5416b11f587757d6696e0605c889d Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 21 Jun 2017 18:24:14 +0100 Subject: [PATCH 2/2] 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 96bac53aa5..5164bc5b89 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{