github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1294 from weaveworks/1293-container-pod-link

Browse Source 
Construct correct id for pod parents
This commit is contained in:
Paul Bellamy
2016-04-13 13:58:46 +01:00
parent 73a2108ea3 df1ccae9f6
commit 398258f3a7
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
render/detailed/parents.go
View File

@@ -55,41 +55,35 @@ func Parents(r report.Report, n report.Node) (result []Parent) {
func containerParent(n report.Node) Parent {
label := getRenderableContainerName(n)
containerID, _ := n.Latest.Lookup(docker.ContainerID)
return Parent{
ID: report.MakeContainerNodeID(containerID),
ID: n.ID,
Label: label,
TopologyID: "containers",
}
}
func podParent(n report.Node) Parent {
namespace, _ := n.Latest.Lookup(kubernetes.Namespace)
podID, _ := n.Latest.Lookup(kubernetes.PodID)
podName, _ := n.Latest.Lookup(kubernetes.PodName)
return Parent{
ID: report.MakePodNodeID(namespace, podID),
ID: n.ID,
Label: podName,
TopologyID: "pods",
}
}
func serviceParent(n report.Node) Parent {
namespace, _ := n.Latest.Lookup(kubernetes.Namespace)
serviceID, _ := n.Latest.Lookup(kubernetes.ServiceID)
serviceName, _ := n.Latest.Lookup(kubernetes.ServiceName)
return Parent{
ID: report.MakeServiceNodeID(namespace, serviceID),
ID: n.ID,
Label: serviceName,
TopologyID: "pods-by-service",
}
}
func containerImageParent(n report.Node) Parent {
imageID, _ := n.Latest.Lookup(docker.ImageID)
imageName, _ := n.Latest.Lookup(docker.ImageName)
return Parent{
ID: report.MakeContainerImageNodeID(imageID),
ID: n.ID,
Label: imageName,
TopologyID: "containers-by-image",
}
@@ -98,7 +92,7 @@ func containerImageParent(n report.Node) Parent {
func hostParent(n report.Node) Parent {
hostName, _ := n.Latest.Lookup(host.HostName)
return Parent{
ID: report.MakeHostNodeID(hostName),
ID: n.ID,
Label: hostName,
TopologyID: "hosts",
}