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 #1723 from weaveworks/name-routes

Browse Source 
Name our routes, so /metrics gives more sensible aggregations
This commit is contained in:
Paul Bellamy
2016-07-26 13:45:24 +01:00
committed by GitHub
parent 2132528823 274158493d
commit 683727eaa2
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controls.go
View File

@@ -14,9 +14,14 @@ import (
// RegisterControlRoutes registers the various control routes with a http mux.
func RegisterControlRoutes(router *mux.Router, cr ControlRouter) {
router.Methods("GET").Path("/api/control/ws").
router.
Methods("GET").
Path("/api/control/ws").
HandlerFunc(requestContextDecorator(handleProbeWS(cr)))
router.Methods("POST").MatcherFunc(URLMatcher("/api/control/{probeID}/{nodeID}/{control}")).
router.
Methods("POST").
Name("api_control_probeid_nodeid_control").
MatcherFunc(URLMatcher("/api/control/{probeID}/{nodeID}/{control}")).
HandlerFunc(requestContextDecorator(handleControl(cr)))
}

4
app/pipes.go
View File

@@ -13,18 +13,22 @@ import (
// RegisterPipeRoutes registers the pipe routes
func RegisterPipeRoutes(router *mux.Router, pr PipeRouter) {
router.Methods("GET").
Name("api_pipe_pipeid_check").
Path("/api/pipe/{pipeID}/check").
HandlerFunc(requestContextDecorator(checkPipe(pr, UIEnd)))
router.Methods("GET").
Name("api_pipe_pipeid").
Path("/api/pipe/{pipeID}").
HandlerFunc(requestContextDecorator(handlePipeWs(pr, UIEnd)))
router.Methods("GET").
Name("api_pipe_pipeid_probe").
Path("/api/pipe/{pipeID}/probe").
HandlerFunc(requestContextDecorator(handlePipeWs(pr, ProbeEnd)))
router.Methods("DELETE", "POST").
Name("api_pipe_pipeid").
Path("/api/pipe/{pipeID}").
HandlerFunc(requestContextDecorator(deletePipe(pr)))
}

18
app/router.go
View File

@@ -88,12 +88,18 @@ func RegisterTopologyRoutes(router *mux.Router, r Reporter) {
gzipHandler(requestContextDecorator(apiHandler(r))))
get.HandleFunc("/api/topology",
gzipHandler(requestContextDecorator(topologyRegistry.makeTopologyList(r))))
get.HandleFunc("/api/topology/{topology}",
gzipHandler(requestContextDecorator(topologyRegistry.captureRenderer(r, handleTopology))))
get.HandleFunc("/api/topology/{topology}/ws",
requestContextDecorator(captureReporter(r, handleWebsocket))) // NB not gzip!
get.MatcherFunc(URLMatcher("/api/topology/{topology}/{id}")).HandlerFunc(
gzipHandler(requestContextDecorator(topologyRegistry.captureRenderer(r, handleNode))))
get.
HandleFunc("/api/topology/{topology}",
gzipHandler(requestContextDecorator(topologyRegistry.captureRenderer(r, handleTopology)))).
Name("api_topology_topology")
get.
HandleFunc("/api/topology/{topology}/ws",
requestContextDecorator(captureReporter(r, handleWebsocket))). // NB not gzip!
Name("api_topology_topology_ws")
get.
MatcherFunc(URLMatcher("/api/topology/{topology}/{id}")).HandlerFunc(
gzipHandler(requestContextDecorator(topologyRegistry.captureRenderer(r, handleNode)))).
Name("api_topology_topology_id")
get.HandleFunc("/api/report",
gzipHandler(requestContextDecorator(makeRawReportHandler(r))))
get.HandleFunc("/api/probes",