Remove tz, from, and until parameters from expand handler

Author: martialblog

COMPATIBILITY.md

@@ -102,8 +102,12 @@ _When `format=png`_ (default if not specified)
 * `jsonp` : ...
 * `query` : the metric or glob-pattern to find
 
+### /metrics/expand/?
 
-
+* `query` : the metric or glob-pattern to find
+* `jsonp` : ...
+* `groupByExpr`: (0 or 1)
+* `leavesOnly`: (0 or 1)
 
 ## Graphite-web 1.1.7 compatibility
 ### Unsupported functions

cmd/carbonapi/http/expand_handler.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/go-graphite/carbonapi/carbonapipb"
 	"github.com/go-graphite/carbonapi/cmd/carbonapi/config"
-	"github.com/go-graphite/carbonapi/date"
 	utilctx "github.com/go-graphite/carbonapi/util/ctx"
 )
 
@@ -32,12 +31,6 @@ func expandHandler(w http.ResponseWriter, r *http.Request) {
 	groupByExpr := r.FormValue("groupByExpr")
 	leavesOnly := r.FormValue("leavesOnly")
 
-	qtz := r.FormValue("tz")
-	from := r.FormValue("from")
-	until := r.FormValue("until")
-	from64 := date.DateParamToEpoch(from, qtz, timeNow().Add(-time.Hour).Unix(), config.Config.DefaultTimeZone)
-	until64 := date.DateParamToEpoch(until, qtz, timeNow().Unix(), config.Config.DefaultTimeZone)
-
 	srcIP, srcPort := splitRemoteAddr(r.RemoteAddr)
 
 	accessLogger := zapwriter.Logger("access")
@@ -84,8 +77,6 @@ func expandHandler(w http.ResponseWriter, r *http.Request) {
 
 	var pv3Request pbv3.MultiGlobRequest
 	pv3Request.Metrics = query
-	pv3Request.StartTime = from64
-	pv3Request.StopTime = until64
 
 	multiGlobs, stats, err := config.Config.ZipperInstance.Find(ctx, pv3Request)
 	if stats != nil {

cmd/carbonapi/http/helper.go

@@ -65,6 +65,8 @@ func (r responseFormat) String() string {
 
 func (r responseFormat) ValidExpandFormat() bool {
 	switch r {
+	case treejsonFormat:
+		return true
 	case jsonFormat:
 		return true
 	default: