From 8a4acefd66275ecc51878f7dc3f054dae1c21f86 Mon Sep 17 00:00:00 2001 From: Julius Volz Date: Fri, 20 Mar 2015 23:10:58 +0100 Subject: [PATCH] Allow custom timestamps in instant query API. --- web/api/query.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/api/query.go b/web/api/query.go index 7f5bfb16a..5eb452306 100644 --- a/web/api/query.go +++ b/web/api/query.go @@ -47,6 +47,14 @@ func (serv MetricsService) Query(w http.ResponseWriter, r *http.Request) { params := httputils.GetQueryParams(r) expr := params.Get("expr") asText := params.Get("asText") + tsFloat, _ := strconv.ParseFloat(params.Get("timestamp"), 64) + + var timestamp clientmodel.Timestamp + if tsFloat == 0 { + timestamp = clientmodel.Now() + } else { + timestamp = clientmodel.TimestampFromUnixNano(int64(tsFloat) * int64(time.Second/time.Nanosecond)) + } var format ast.OutputFormat // BUG(julius): Use Content-Type negotiation. @@ -64,7 +72,6 @@ func (serv MetricsService) Query(w http.ResponseWriter, r *http.Request) { return } - timestamp := clientmodel.TimestampFromTime(serv.time.Now()) queryStats := stats.NewTimerGroup() result := ast.EvalToString(exprNode, timestamp, format, serv.Storage, queryStats) glog.V(1).Infof("Instant query: %s\nQuery stats:\n%s\n", expr, queryStats)