From 39e735f99e12443dba3d6b9b60e56a0519e80e3c Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Fri, 20 Jan 2017 17:12:40 -0800 Subject: [PATCH] render.detailed: Add ECS topologies to detailed parents conversion so they will correctly show up in the details view. Currently, since ECS topologies aren't considered, the ECS parents of nodes are silently dropped. --- render/detailed/parents.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/render/detailed/parents.go b/render/detailed/parents.go index 29104e495..910f1f49a 100644 --- a/render/detailed/parents.go +++ b/render/detailed/parents.go @@ -3,6 +3,7 @@ package detailed import ( "sort" + "github.com/weaveworks/scope/probe/awsecs" "github.com/weaveworks/scope/probe/host" "github.com/weaveworks/scope/probe/kubernetes" "github.com/weaveworks/scope/report" @@ -38,6 +39,8 @@ func Parents(r report.Report, n report.Node) (result []Parent) { report.ReplicaSet: {node(r.ReplicaSet), replicaSetParent}, report.Deployment: {node(r.Deployment), deploymentParent}, report.Service: {node(r.Service), serviceParent}, + report.ECSTask: {node(r.ECSTask), ecsTaskParent}, + report.ECSService: {node(r.ECSService), ecsServiceParent}, report.ContainerImage: {fake, containerImageParent}, report.Host: {node(r.Host), hostParent}, } @@ -92,6 +95,24 @@ func kubernetesParent(topology string) func(report.Node) Parent { } } +func ecsTaskParent(n report.Node) Parent { + family, _ := n.Latest.Lookup(awsecs.TaskFamily) + return Parent{ + ID: n.ID, + Label: family, + TopologyID: "ecs-tasks", + } +} + +func ecsServiceParent(n report.Node) Parent { + name, _ := report.ParseECSServiceNodeID(n.ID) + return Parent{ + ID: n.ID, + Label: name, + TopologyID: "ecs-services", + } +} + func containerImageParent(n report.Node) Parent { name, _ := report.ParseContainerImageNodeID(n.ID) return Parent{