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

Merge pull request #199 from tomwilkie/198-details

Browse Source 
Restore container details to their rightful position.
This commit is contained in:
Tom Wilkie
2015-06-10 08:59:16 +01:00
parent 5be7235da2 cce2e3c0b5
commit 4094095d71
2 changed files with 14 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
app/origin_node.go
View File

@@ -1,67 +0,0 @@
package main
import "github.com/weaveworks/scope/report"
// OriginNode is a node in the originating report topology. It's a process ID
// or network host. It's used by the /api/topology/{topology}/{nodeID} handler
// to generate detailed information. One node from a rendered topology may
// have multiple origin nodes.
type OriginNode struct {
Table report.Table
}
func getOriginNode(t report.Topology, id string) (OriginNode, bool) {
node, ok := t.NodeMetadatas[id]
if !ok {
return OriginNode{}, false
}
// The node represents different actual things depending on the topology.
// So we deduce what it is, based on the metadata.
if _, ok := node["pid"]; ok {
return originNodeForProcess(node), true
}
// Assume network host. Could strengthen this guess by adding a
// special key in the probe spying procedure.
return originNodeForNetworkHost(node), true
}
func originNodeForProcess(node report.NodeMetadata) OriginNode {
rows := []report.Row{
{Key: "Host", ValueMajor: node["domain"], ValueMinor: ""},
{Key: "PID", ValueMajor: node["pid"], ValueMinor: ""},
{Key: "Process name", ValueMajor: node["name"], ValueMinor: ""},
}
for _, tuple := range []struct{ key, human string }{
{"docker_container_id", "Container ID"},
{"docker_container_name", "Container name"},
{"docker_image_id", "Container image ID"},
{"docker_image_name", "Container image name"},
{"cgroup", "cgroup"},
} {
if val, ok := node[tuple.key]; ok {
rows = append(rows, report.Row{Key: tuple.human, ValueMajor: val, ValueMinor: ""})
}
}
return OriginNode{
Table: report.Table{
Title: "Origin Process",
Numeric: false,
Rows: rows,
},
}
}
func originNodeForNetworkHost(node report.NodeMetadata) OriginNode {
rows := []report.Row{
{"Hostname", node["name"], ""},
}
return OriginNode{
Table: report.Table{
Title: "Origin Host",
Numeric: false,
Rows: rows,
},
}
}

19
report/detailed_node.go
View File

@@ -60,11 +60,20 @@ func OriginTable(r Report, originID string) (Table, bool) {
func endpointOriginTable(nmd NodeMetadata) (Table, bool) {
rows := []Row{}
if val, ok := nmd["endpoint"]; ok {
rows = append(rows, Row{"Endpoint", val, ""})
}
if val, ok := nmd["host_name"]; ok {
rows = append(rows, Row{"Host name", val, ""})
for _, tuple := range []struct{ key, human string }{
{"endpoint", "Endpoint"},
{"host_name", "Host name"},
{"pid", "PID"},
{"name", "Process name"},
{"docker_container_id", "Container ID"},
{"docker_container_name", "Container name"},
{"docker_image_id", "Container image ID"},
{"docker_image_name", "Container image name"},
{"cgroup", "cgroup"},
} {
if val, ok := nmd[tuple.key]; ok {
rows = append(rows, Row{Key: tuple.human, ValueMajor: val, ValueMinor: ""})
}
}
return Table{
Title: "Origin Endpoint",