IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

grafana-10039: fix query time range ends in the past

Browse Source
This commit is contained in:
Andrei Kalasok
2017-11-30 15:10:44 +01:00
committed by Andrei Kalasok
parent 603725aeb0
commit 68d4211c50
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/graphite/graphite.go
View File

@@ -17,7 +17,7 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
) )
type GraphiteExecutor struct { type GraphiteExecutor struct {
@@ -158,7 +158,7 @@ func formatTimeRange(input string) string {
if input == "now" { if input == "now" {
return input return input
} }
return strings.Replace(strings.Replace(input, "m", "min", -1), "M", "mon", -1) return strings.Replace(strings.Replace(strings.Replace(input, "now", "", -1), "m", "min", -1), "M", "mon", -1)
} }
func fixIntervalFormat(target string) string { func fixIntervalFormat(target string) string {

4
pkg/tsdb/graphite/graphite_test.go
View File

@@ -18,14 +18,14 @@ func TestGraphiteFunctions(t *testing.T) {
Convey("formatting time range for now-1m", func() { Convey("formatting time range for now-1m", func() {
timeRange := formatTimeRange("now-1m") timeRange := formatTimeRange("now-1m")
So(timeRange, ShouldEqual, "now-1min") So(timeRange, ShouldEqual, "-1min")
}) })
Convey("formatting time range for now-1M", func() { Convey("formatting time range for now-1M", func() {
timeRange := formatTimeRange("now-1M") timeRange := formatTimeRange("now-1M")
So(timeRange, ShouldEqual, "now-1mon") So(timeRange, ShouldEqual, "-1mon")
}) })