Metrics for graphite web

api/middleware/stats.go

@@ -72,6 +72,12 @@ func RequestStats() macaron.Handler {
 		ctx.Next()
 		status := rw.Status()
 		path := pathSlug(ctx.Req.URL.Path)
+		// graphite cluster requests use local=1
+		// this way we can differentiate "full" render requests from client to MT (encompassing data processing, proxing to graphite, etc)
+		// from "subrequests" where metrictank is called by graphite and graphite does the processing and returns to the client
+		if ctx.Req.Request.Form.Get("local") == "1" {
+			path += "-local"
+		}
 		stats.PathStatusCount(path, status)
 		stats.PathLatency(path, time.Since(start))
 		// only record the request size if the request succeeded.

api/routes.go

@@ -29,11 +29,6 @@ func (s *Server) RegisterRoutes() {
 	r.Get("/cluster", s.getClusterStatus)
 
 	r.Combo("/getdata", bind(models.GetData{})).Get(s.getData).Post(s.getData)
-	// equivalent to /render but used by graphite-metrictank so we can keep the stats separate
-	// note, you should not request anything from this endpoint that may trigger a loop
-	// (where MT proxies the req to graphite, graphite hits /get again, and so on).
-	// just don't request any function processing, or maybe just some of the stable functions
-	r.Combo("/get", withOrg, bind(models.GraphiteRender{})).Get(s.renderMetrics).Post(s.renderMetrics)
 
 	r.Combo("/index/find", bind(models.IndexFind{})).Get(s.indexFind).Post(s.indexFind)
 	r.Combo("/index/list", bind(models.IndexList{})).Get(s.indexList).Post(s.indexList)