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

Verified interval format function and gofmt check

Browse Source
This commit is contained in:
utkarshcmu 2016-11-02 02:07:08 -07:00
parent 2088363bf9
commit a4a2e35bb2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,9 +9,9 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"path" "path"
"regexp"
"strings" "strings"
"time" "time"
"regexp"
"golang.org/x/net/context/ctxhttp" "golang.org/x/net/context/ctxhttp"
@ -153,15 +153,16 @@ func formatTimeRange(input string) string {
} }
func fixIntervalFormat(target string) string { func fixIntervalFormat(target string) string {
rMinute := regexp.MustCompile("'(\\d+)m'") rMinute := regexp.MustCompile(`'(\d+)m'`)
rMin := regexp.MustCompile("m") rMin := regexp.MustCompile("m")
target = rMinute.ReplaceAllStringFunc(target, func(m string) string { target = rMinute.ReplaceAllStringFunc(target, func(m string) string {
return rMin.ReplaceAllString(m, "min") return rMin.ReplaceAllString(m, "min")
}) })
rMonth := regexp.MustCompile("'(\\d+)M'") rMonth := regexp.MustCompile(`'(\d+)M'`)
rMon := regexp.MustCompile("M") rMon := regexp.MustCompile("M")
target = rMonth.ReplaceAllStringFunc(target, func(M string) string { target = rMonth.ReplaceAllStringFunc(target, func(M string) string {
return rMon.ReplaceAllString(M, "mon") return rMon.ReplaceAllString(M, "mon")
}) })
glog.Debug("Graphite Query", "target", target)
return target return target
} }

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

@ -6,7 +6,7 @@ import (
) )
func TestGraphiteFunctions(t *testing.T) { func TestGraphiteFunctions(t *testing.T) {
Convey("Testing Graphite Executor", t, func() { Convey("Testing Graphite Functions", t, func() {
Convey("formatting time range for now", func() { Convey("formatting time range for now", func() {