Probes POST to apps

app/api_report.go

@@ -2,10 +2,12 @@ package main
 
 import (
 	"net/http"
+
+	"github.com/weaveworks/scope/xfer"
 )
 
 // Raw report handler
-func makeRawReportHandler(rep Reporter) func(http.ResponseWriter, *http.Request) {
+func makeRawReportHandler(rep xfer.Reporter) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		// r.ParseForm()
 		respondWith(w, http.StatusOK, rep.Report())

app/api_topologies.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/weaveworks/scope/render"
+	"github.com/weaveworks/scope/xfer"
 )
 
 // APITopologyDesc is returned in a list by the /api/topology handler.
@@ -21,7 +22,7 @@ type topologyStats struct {
 }
 
 // makeTopologyList returns a handler that yields an APITopologyList.
-func makeTopologyList(rep Reporter) func(w http.ResponseWriter, r *http.Request) {
+func makeTopologyList(rep xfer.Reporter) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var (
 			rpt        = rep.Report()

app/api_topology.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/report"
+	"github.com/weaveworks/scope/xfer"
 )
 
 const (
@@ -32,14 +33,14 @@ type APIEdge struct {
 }
 
 // Full topology.
-func handleTopology(rep Reporter, t topologyView, w http.ResponseWriter, r *http.Request) {
+func handleTopology(rep xfer.Reporter, t topologyView, w http.ResponseWriter, r *http.Request) {
 	respondWith(w, http.StatusOK, APITopology{
 		Nodes: t.renderer.Render(rep.Report()),
 	})
 }
 
 // Websocket for the full topology. This route overlaps with the next.
-func handleWs(rep Reporter, t topologyView, w http.ResponseWriter, r *http.Request) {
+func handleWs(rep xfer.Reporter, t topologyView, w http.ResponseWriter, r *http.Request) {
 	if err := r.ParseForm(); err != nil {
 		respondWith(w, http.StatusInternalServerError, err.Error())
 		return
@@ -56,7 +57,7 @@ func handleWs(rep Reporter, t topologyView, w http.ResponseWriter, r *http.Reque
 }
 
 // Individual nodes.
-func handleNode(rep Reporter, t topologyView, w http.ResponseWriter, r *http.Request) {
+func handleNode(rep xfer.Reporter, t topologyView, w http.ResponseWriter, r *http.Request) {
 	var (
 		vars     = mux.Vars(r)
 		nodeID   = vars["id"]
@@ -71,7 +72,7 @@ func handleNode(rep Reporter, t topologyView, w http.ResponseWriter, r *http.Req
 }
 
 // Individual edges.
-func handleEdge(rep Reporter, t topologyView, w http.ResponseWriter, r *http.Request) {
+func handleEdge(rep xfer.Reporter, t topologyView, w http.ResponseWriter, r *http.Request) {
 	var (
 		vars     = mux.Vars(r)
 		localID  = vars["local"]
@@ -90,7 +91,7 @@ var upgrader = websocket.Upgrader{
 func handleWebsocket(
 	w http.ResponseWriter,
 	r *http.Request,
-	rep Reporter,
+	rep xfer.Reporter,
 	t topologyView,
 	loop time.Duration,
 ) {

app/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"log"
 	"math/rand"
 	"net/http"
@@ -21,35 +20,17 @@ var version = "dev"
 
 func main() {
 	var (
-		defaultProbes = []string{fmt.Sprintf("localhost:%d", xfer.ProbePort), fmt.Sprintf("scope.weave.local:%d", xfer.ProbePort)}
-		batch         = flag.Duration("batch", 1*time.Second, "batch interval")
-		window        = flag.Duration("window", 15*time.Second, "window")
-		listen        = flag.String("http.address", ":"+strconv.Itoa(xfer.AppPort), "webserver listen address")
-		printVersion  = flag.Bool("version", false, "print version number and exit")
+		window = flag.Duration("window", 15*time.Second, "window")
+		listen = flag.String("http.address", ":"+strconv.Itoa(xfer.AppPort), "webserver listen address")
 	)
 	flag.Parse()
-	probes := append(defaultProbes, flag.Args()...)
-
-	if *printVersion {
-		fmt.Println(version)
-		return
-	}
 
 	rand.Seed(time.Now().UnixNano())
 	id := strconv.FormatInt(rand.Int63(), 16)
-	log.Printf("app starting, version %s, id %s", version, id)
-
-	// Collector deals with the probes, and generates merged reports.
-	c := xfer.NewCollector(*batch, id)
-	defer c.Stop()
-
-	r := newStaticResolver(probes, c.Add)
-	defer r.Stop()
-
-	lifo := NewReportLIFO(c, *window)
-	defer lifo.Stop()
+	log.Printf("app starting, version %s, ID %s", version, id)
 
-	http.Handle("/", Router(lifo))
+	c := xfer.NewCollector(*window)
+	http.Handle("/", Router(c))
 	irq := interrupt()
 	go func() {
 		log.Printf("listening on %s", *listen)

app/mock_reporter_test.go

@@ -5,9 +5,9 @@ import (
 	"github.com/weaveworks/scope/test"
 )
 
-// StaticReport is used as know test data in api tests.
+// StaticReport is used as a fixture in tests. It emulates an xfer.Collector.
 type StaticReport struct{}
 
-func (s StaticReport) Report() report.Report {
-	return test.Report
-}
+func (s StaticReport) Report() report.Report { return test.Report }
+
+func (s StaticReport) Add(report.Report) {}

app/origin_host.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/weaveworks/scope/probe/host"
 	"github.com/weaveworks/scope/report"
+	"github.com/weaveworks/scope/xfer"
 )
 
 // OriginHost represents a host that runs a probe, i.e. the origin host of
@@ -35,7 +36,7 @@ func getOriginHost(t report.Topology, nodeID string) (OriginHost, bool) {
 }
 
 // makeOriginHostHandler makes the /api/origin/* handler.
-func makeOriginHostHandler(rep Reporter) http.HandlerFunc {
+func makeOriginHostHandler(rep xfer.Reporter) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var (
 			vars   = mux.Vars(r)

app/router.go

@@ -1,13 +1,16 @@
 package main
 
 import (
+	"encoding/gob"
 	"net/http"
 	"net/url"
 	"strings"
 
 	"github.com/gorilla/mux"
 
 	"github.com/weaveworks/scope/render"
+	"github.com/weaveworks/scope/report"
+	"github.com/weaveworks/scope/xfer"
 )
 
 // URLMatcher uses request.RequestURI (the raw, unparsed request) to attempt
@@ -41,10 +44,17 @@ func URLMatcher(pattern string) mux.MatcherFunc {
 	}
 }
 
-// Router gives of the HTTP dispatcher. It will always use the embedded HTML
-// resources.
-func Router(c Reporter) *mux.Router {
+type collector interface {
+	xfer.Reporter
+	xfer.Adder
+}
+
+// Router returns the HTTP dispatcher, managing API and UI requests, and
+// accepting reports from probes.. It will always use the embedded HTML
+// resources for the UI.
+func Router(c collector) *mux.Router {
 	router := mux.NewRouter()
+	router.HandleFunc("/api/report", makeReportPostHandler(c)).Methods("POST")
 	get := router.Methods("GET").Subrouter()
 	get.HandleFunc("/api", apiHandler)
 	get.HandleFunc("/api/topology", makeTopologyList(c))
@@ -58,7 +68,19 @@ func Router(c Reporter) *mux.Router {
 	return router
 }
 
-func captureTopology(rep Reporter, f func(Reporter, topologyView, http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
+func makeReportPostHandler(a xfer.Adder) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var rpt report.Report
+		if err := gob.NewDecoder(r.Body).Decode(&rpt); err != nil {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+		a.Add(rpt)
+		w.WriteHeader(http.StatusOK)
+	}
+}
+
+func captureTopology(rep xfer.Reporter, f func(xfer.Reporter, topologyView, http.ResponseWriter, *http.Request)) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		topology, ok := topologyRegistry[mux.Vars(r)["topology"]]
 		if !ok {

docker/entrypoint.sh

@@ -54,10 +54,10 @@ if [ -n "$DNS_SERVER" -a -n "$SEARCHPATH" ]; then
 fi
 
 # End of the command line can optionally be some
-# addresses of probes to connect to, for people not
-# using Weave DNS.  We stick these in /etc/weave/probes
-# for the run-app script to pick up.
-MANUAL_PROBES=$@
-echo "$MANUAL_PROBES" >/etc/weave/probes
+# addresses of apps to connect to, for people not
+# using Weave DNS. We stick these in /etc/weave/apps
+# for the run-probe script to pick up.
+MANUAL_APPS=$@
+echo "$MANUAL_APPS" >/etc/weave/apps
 
 exec /sbin/runsvdir /etc/service

docker/run-app

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /home/weave/scope-app $(cat /etc/weave/scope-app.args) $(cat /etc/weave/probes)
+exec /home/weave/scope-app $(cat /etc/weave/scope-app.args)

docker/run-probe

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /home/weave/scope-probe $(cat /etc/weave/scope-probe.args)
+exec /home/weave/scope-probe $(cat /etc/weave/scope-probe.args) $(cat /etc/weave/apps)