From 3c0b5fe78eadd5bd25926b743569e40a1e30914c Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 10 Jun 2016 13:26:19 +0200 Subject: [PATCH] tech(alerting): add graphite dateformat replacer --- pkg/tsdb/graphite/graphite.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go index 0be6cf04e12..98f4c648048 100644 --- a/pkg/tsdb/graphite/graphite.go +++ b/pkg/tsdb/graphite/graphite.go @@ -5,6 +5,7 @@ import ( "io/ioutil" "net/http" "net/url" + "strings" "time" "github.com/grafana/grafana/pkg/log" @@ -30,7 +31,7 @@ func (e *GraphiteExecutor) Execute(queries tsdb.QuerySlice, context *tsdb.QueryC result := &tsdb.BatchResult{} params := url.Values{ - "from": []string{context.TimeRange.From}, + "from": []string{formatTimeRange(context.TimeRange.From)}, "until": []string{context.TimeRange.To}, "format": []string{"json"}, "maxDataPoints": []string{"500"}, @@ -76,3 +77,7 @@ func (e *GraphiteExecutor) Execute(queries tsdb.QuerySlice, context *tsdb.QueryC result.QueryResults["A"] = queryRes return result } + +func formatTimeRange(input string) string { + return strings.Replace(strings.Replace(input, "m", "min", -1), "M", "mon", -1) +}