removing render/detailed/labels, as its not a good fit anymore

render/detailed/labels.go

@@ -1,60 +0,0 @@
-package detailed
-
-import (
-	"strings"
-
-	"github.com/weaveworks/scope/probe/docker"
-	"github.com/weaveworks/scope/probe/host"
-	"github.com/weaveworks/scope/probe/kubernetes"
-	"github.com/weaveworks/scope/probe/overlay"
-	"github.com/weaveworks/scope/probe/process"
-	"github.com/weaveworks/scope/report"
-)
-
-var labels = map[string]string{
-	docker.CPUTotalUsage:         "CPU",
-	docker.ContainerCommand:      "Command",
-	docker.ContainerCreated:      "Created",
-	docker.ContainerHostname:     "Hostname",
-	docker.ContainerID:           "ID",
-	docker.ContainerIPs:          "IPs",
-	docker.ContainerPorts:        "Ports",
-	docker.ContainerRestartCount: "Restart #",
-	docker.ContainerStateHuman:   "State",
-	docker.ContainerUptime:       "Uptime",
-	docker.ImageID:               "Image ID",
-	docker.MemoryUsage:           "Memory",
-	host.CPUUsage:                "CPU",
-	host.HostName:                "Hostname",
-	host.KernelVersion:           "Kernel version",
-	host.Load1:                   "Load (1m)",
-	host.LocalNetworks:           "Local Networks",
-	host.MemoryUsage:             "Memory",
-	host.OS:                      "OS",
-	host.Uptime:                  "Uptime",
-	kubernetes.Namespace:         "Namespace",
-	kubernetes.PodCreated:        "Created",
-	kubernetes.PodID:             "ID",
-	overlay.WeaveDNSHostname:     "Weave DNS Name",
-	overlay.WeaveMACAddress:      "Weave MAC",
-	process.CPUUsage:             "CPU",
-	process.Cmdline:              "Command",
-	process.MemoryUsage:          "Memory",
-	process.OpenFilesCount:       "Open Files",
-	process.PID:                  "PID",
-	process.PPID:                 "Parent PID",
-	process.Threads:              "# Threads",
-	report.Container:             "# Containers",
-}
-
-// Label maps from the internal keys to the human-readable label for a piece
-// of metadata/set/etc. If none is found the raw key will be returned.
-func Label(key string) string {
-	if label, ok := labels[key]; ok {
-		return label
-	}
-	if strings.HasPrefix(key, "label_") {
-		return strings.TrimPrefix(key, "label_")
-	}
-	return key
-}

render/detailed/node.go

@@ -131,8 +131,8 @@ var (
 				TopologyID: "hosts",
 				Label:      "Hosts",
 				Columns: []Column{
-					MakeColumn(host.CPUUsage),
-					MakeColumn(host.MemoryUsage),
+					{ID: host.CPUUsage, Label: "CPU"},
+					{ID: host.MemoryUsage, Label: "Memory"},
 				},
 			},
 		},
@@ -148,8 +148,8 @@ var (
 			NodeSummaryGroup: NodeSummaryGroup{
 				TopologyID: "containers",
 				Label:      "Containers", Columns: []Column{
-					MakeColumn(docker.CPUTotalUsage),
-					MakeColumn(docker.MemoryUsage),
+					{ID: docker.CPUTotalUsage, Label: "CPU"},
+					{ID: docker.MemoryUsage, Label: "Memory"},
 				},
 			},
 		},
@@ -158,9 +158,9 @@ var (
 			NodeSummaryGroup: NodeSummaryGroup{
 				TopologyID: "processes",
 				Label:      "Processes", Columns: []Column{
-					{ID: process.PID, Label: Label(process.PID)},
-					MakeColumn(process.CPUUsage),
-					MakeColumn(process.MemoryUsage),
+					{ID: process.PID, Label: "PID"},
+					{ID: process.CPUUsage, Label: "CPU"},
+					{ID: process.MemoryUsage, Label: "Memory"},
 				},
 			},
 		},
@@ -170,7 +170,7 @@ var (
 				TopologyID: "containers-by-image",
 				Label:      "Container Images",
 				Columns: []Column{
-					{ID: report.Container, Label: Label(report.Container), DefaultSort: true},
+					{ID: report.Container, Label: "# Containers", DefaultSort: true},
 				},
 			},
 		},

render/detailed/node_test.go

@@ -96,20 +96,27 @@ func TestMakeDetailedHostNode(t *testing.T) {
 			{
 				Label:      "Containers",
 				TopologyID: "containers",
-				Columns:    []detailed.Column{detailed.MakeColumn(docker.CPUTotalUsage), detailed.MakeColumn(docker.MemoryUsage)},
-				Nodes:      []detailed.NodeSummary{containerNodeSummary},
+				Columns: []detailed.Column{
+					{ID: docker.CPUTotalUsage, Label: "CPU"},
+					{ID: docker.MemoryUsage, Label: "Memory"},
+				},
+				Nodes: []detailed.NodeSummary{containerNodeSummary},
 			},
 			{
 				Label:      "Processes",
 				TopologyID: "processes",
-				Columns:    []detailed.Column{detailed.MakeColumn(process.PID), detailed.MakeColumn(process.CPUUsage), detailed.MakeColumn(process.MemoryUsage)},
-				Nodes:      []detailed.NodeSummary{process1NodeSummary, process2NodeSummary},
+				Columns: []detailed.Column{
+					{ID: process.PID, Label: "PID"},
+					{ID: process.CPUUsage, Label: "CPU"},
+					{ID: process.MemoryUsage, Label: "Memory"},
+				},
+				Nodes: []detailed.NodeSummary{process1NodeSummary, process2NodeSummary},
 			},
 			{
 				Label:      "Container Images",
 				TopologyID: "containers-by-image",
 				Columns: []detailed.Column{
-					{ID: report.Container, Label: detailed.Label(report.Container), DefaultSort: true},
+					{ID: report.Container, Label: "# Containers", DefaultSort: true},
 				},
 				Nodes: []detailed.NodeSummary{containerImageNodeSummary},
 			},
@@ -209,8 +216,12 @@ func TestMakeDetailedContainerNode(t *testing.T) {
 			{
 				Label:      "Processes",
 				TopologyID: "processes",
-				Columns:    []detailed.Column{detailed.MakeColumn(process.PID), detailed.MakeColumn(process.CPUUsage), detailed.MakeColumn(process.MemoryUsage)},
-				Nodes:      []detailed.NodeSummary{serverProcessNodeSummary},
+				Columns: []detailed.Column{
+					{ID: process.PID, Label: "PID"},
+					{ID: process.CPUUsage, Label: "CPU"},
+					{ID: process.MemoryUsage, Label: "Memory"},
+				},
+				Nodes: []detailed.NodeSummary{serverProcessNodeSummary},
 			},
 		},
 		Parents: []detailed.Parent{

render/detailed/summary.go

@@ -58,14 +58,6 @@ type Column struct {
 	DefaultSort bool   `json:"defaultSort"`
 }
 
-// MakeColumn makes a Column by looking up the label by id.
-func MakeColumn(id string) Column {
-	return Column{
-		ID:    id,
-		Label: Label(id),
-	}
-}
-
 // NodeSummary is summary information about a child for a Node.
 type NodeSummary struct {
 	ID           string               `json:"id"`