Make render module produce The Internet pseudo node.

app/api_topology_test.go

@@ -80,34 +80,35 @@ func TestAPITopologyHosts(t *testing.T) {
 			t.Fatal(err)
 		}
 		equals(t, 3, len(topo.Nodes))
-		node, ok := topo.Nodes["host:host-b"]
+		node, ok := topo.Nodes["host:hostB"]
 		if !ok {
-			t.Errorf("missing host:host-b node")
+			t.Errorf("missing host:hostB node")
+			t.Errorf("%+v", topo)
 		}
-		equals(t, report.MakeIDList("host:host-a"), node.Adjacency)
+		equals(t, report.MakeIDList("host:hostA"), node.Adjacency)
 		equals(t, report.MakeIDList(
 			report.MakeAddressNodeID("hostB", "192.168.1.2"),
 			report.MakeHostNodeID("hostB"),
 		), node.Origins)
-		equals(t, "host-b", node.LabelMajor)
-		equals(t, "", node.LabelMinor)
-		equals(t, "host-b", node.Rank)
+		equals(t, "node-b", node.LabelMajor)
+		equals(t, "local", node.LabelMinor)
+		equals(t, "local", node.Rank)
 		equals(t, false, node.Pseudo)
 	}
 	{
-		body := getRawJSON(t, ts, "/api/topology/hosts/host:host-b")
+		body := getRawJSON(t, ts, "/api/topology/hosts/host:hostB")
 		var node APINode
 		if err := json.Unmarshal(body, &node); err != nil {
 			t.Fatal(err)
 		}
-		equals(t, "host:host-b", node.Node.ID)
-		equals(t, "host-b", node.Node.LabelMajor)
-		equals(t, "", node.Node.LabelMinor)
+		equals(t, "host:hostB", node.Node.ID)
+		equals(t, "node-b", node.Node.LabelMajor)
+		equals(t, "local", node.Node.LabelMinor)
 		equals(t, false, node.Node.Pseudo)
 		// Let's not unit-test the specific content of the detail tables
 	}
 	{
-		body := getRawJSON(t, ts, "/api/topology/hosts/host:host-b/host:host-a")
+		body := getRawJSON(t, ts, "/api/topology/hosts/host:hostB/host:hostA")
 		var edge APIEdge
 		if err := json.Unmarshal(body, &edge); err != nil {
 			t.Fatalf("JSON parse error: %s", err)

app/mock_reporter_test.go

@@ -142,11 +142,11 @@ func (s StaticReport) Report() report.Report {
 			},
 			NodeMetadatas: report.NodeMetadatas{
 				report.MakeAddressNodeID("hostA", "192.168.1.1"): report.NodeMetadata{
-					"name":            "host-a",
+					"addr":            "192.168.1.1",
 					report.HostNodeID: report.MakeHostNodeID("hostA"),
 				},
 				report.MakeAddressNodeID("hostB", "192.168.1.2"): report.NodeMetadata{
-					"name":            "host-b",
+					"addr":            "192.168.1.2",
 					report.HostNodeID: report.MakeHostNodeID("hostB"),
 				},
 			},
@@ -157,15 +157,17 @@ func (s StaticReport) Report() report.Report {
 			EdgeMetadatas: report.EdgeMetadatas{},
 			NodeMetadatas: report.NodeMetadatas{
 				report.MakeHostNodeID("hostA"): report.NodeMetadata{
-					"host_name":      "node-a.local",
-					"os":             "Linux",
-					"local_networks": localNet.String(),
-					"load":           "3.14 2.71 1.61",
+					"host_name":       "node-a.local",
+					"os":              "Linux",
+					"local_networks":  localNet.String(),
+					"load":            "3.14 2.71 1.61",
+					report.HostNodeID: report.MakeHostNodeID("hostA"),
 				},
 				report.MakeHostNodeID("hostB"): report.NodeMetadata{
-					"host_name":      "node-b.local",
-					"os":             "Linux",
-					"local_networks": localNet.String(),
+					"host_name":       "node-b.local",
+					"os":              "Linux",
+					"local_networks":  localNet.String(),
+					report.HostNodeID: report.MakeHostNodeID("hostB"),
 				},
 			},
 		},

app/router.go

@@ -6,7 +6,6 @@ import (
 	"github.com/gorilla/mux"
 
 	"github.com/weaveworks/scope/render"
-	"github.com/weaveworks/scope/report"
 )
 
 // Router gives of the HTTP dispatcher. It will always use the embedded HTML
@@ -70,7 +69,7 @@ var topologyRegistry = map[string]topologyView{
 	"hosts": {
 		human:    "Hosts",
 		parent:   "",
-		renderer: render.LeafMap{Selector: report.SelectAddress, Mapper: render.NetworkHostname, Pseudo: render.GenericPseudoNode},
+		renderer: render.HostRenderer,
 	},
 }
 

experimental/bridge/main.go

@@ -12,6 +12,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/report"
 	"github.com/weaveworks/scope/xfer"
 )
@@ -112,34 +113,6 @@ func makeAvoid(fixed []string) map[string]struct{} {
 	return avoid
 }
 
-// LocalNetworks returns a superset of the networks (think: CIDRs) that are
-// "local" from the perspective of each host represented in the report. It's
-// used to determine which nodes in the report are "remote", i.e. outside of
-// our infrastructure.
-func LocalNetworks(r report.Report) []*net.IPNet {
-	var ipNets []*net.IPNet
-	for _, md := range r.Host.NodeMetadatas {
-		val, ok := md["local_networks"]
-		if !ok {
-			continue
-		}
-	outer:
-		for _, s := range strings.Fields(val) {
-			_, ipNet, err := net.ParseCIDR(s)
-			if err != nil {
-				continue
-			}
-			for _, existing := range ipNets {
-				if ipNet.String() == existing.String() {
-					continue outer
-				}
-			}
-			ipNets = append(ipNets, ipNet)
-		}
-	}
-	return ipNets
-}
-
 // discover reads reports from a collector and republishes them on the
 // publisher, while scanning the reports for IPs to connect to. Only addresses
 // in the network topology of the report are considered. IPs listed in fixed
@@ -155,7 +128,7 @@ func discover(c collector, p publisher, fixed []string) {
 
 		var (
 			now       = time.Now()
-			localNets = LocalNetworks(r)
+			localNets = render.LocalNetworks(r)
 		)
 
 		for _, adjacent := range r.Address.Adjacency {

experimental/graphviz/handle.go

@@ -105,7 +105,7 @@ func engine(r *http.Request) string {
 func mapFunc(r *http.Request) render.LeafMapFunc {
 	switch strings.ToLower(r.FormValue("map_func")) {
 	case "hosts", "networkhost", "networkhostname":
-		return render.NetworkHostname
+		return render.MapAddressIdentity
 	}
 	return render.MapProcessIdentity
 }

probe/main.go

@@ -115,13 +115,15 @@ func main() {
 			select {
 			case <-pubTick:
 				publishTicks.WithLabelValues().Add(1)
-				r.Host = hostTopology(hostID, hostName)
 				publisher.Publish(r)
 				r = report.MakeReport()
 
 			case <-spyTick:
 				r.Merge(spy(hostID, hostName, *spyProcs))
 
+				// Do this every tick so it gets tagged by the OriginHostTagger
+				r.Host = hostTopology(hostID, hostName)
+
 				// TODO abstract PIDTree to a process provider, and provide an
 				// alternate implementation for Darwin.
 				if runtime.GOOS == linux {

probe/spy.go

@@ -54,6 +54,7 @@ func addConnection(
 	if _, ok := r.Address.NodeMetadatas[scopedLocal]; !ok {
 		r.Address.NodeMetadatas[scopedLocal] = report.NodeMetadata{
 			"name": hostName,
+			"addr": c.LocalAddress.String(),
 		}
 	}
 

render/detailed_node.go

@@ -121,12 +121,9 @@ func endpointOriginTable(nmd report.NodeMetadata) (Table, bool) {
 
 func addressOriginTable(nmd report.NodeMetadata) (Table, bool) {
 	rows := []Row{}
-	if val, ok := nmd["address"]; ok {
+	if val, ok := nmd["addr"]; ok {
 		rows = append(rows, Row{"Address", val, ""})
 	}
-	if val, ok := nmd["host_name"]; ok {
-		rows = append(rows, Row{"Host name", val, ""})
-	}
 	return Table{
 		Title:   "Origin Address",
 		Numeric: false,

render/detailed_node_test.go

@@ -25,7 +25,7 @@ func TestOriginTable(t *testing.T) {
 			Title:   "Origin Address",
 			Numeric: false,
 			Rows: []render.Row{
-				{"Host name", clientHostName, ""},
+				{"Address", clientIP, ""},
 			},
 		},
 		serverProcessNodeID: {