From a4a2e35bb247417f68b5c2901908ac55bc559147 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Wed, 2 Nov 2016 02:07:08 -0700 Subject: [PATCH] Verified interval format function and gofmt check --- pkg/tsdb/graphite/graphite.go | 7 ++++--- pkg/tsdb/graphite/graphite_test.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go index 10eb044c5bd..f372079f991 100644 --- a/pkg/tsdb/graphite/graphite.go +++ b/pkg/tsdb/graphite/graphite.go @@ -9,9 +9,9 @@ import ( "net/http" "net/url" "path" + "regexp" "strings" "time" - "regexp" "golang.org/x/net/context/ctxhttp" @@ -153,15 +153,16 @@ func formatTimeRange(input string) string { } func fixIntervalFormat(target string) string { - rMinute := regexp.MustCompile("'(\\d+)m'") + rMinute := regexp.MustCompile(`'(\d+)m'`) rMin := regexp.MustCompile("m") target = rMinute.ReplaceAllStringFunc(target, func(m string) string { return rMin.ReplaceAllString(m, "min") }) - rMonth := regexp.MustCompile("'(\\d+)M'") + rMonth := regexp.MustCompile(`'(\d+)M'`) rMon := regexp.MustCompile("M") target = rMonth.ReplaceAllStringFunc(target, func(M string) string { return rMon.ReplaceAllString(M, "mon") }) + glog.Debug("Graphite Query", "target", target) return target } diff --git a/pkg/tsdb/graphite/graphite_test.go b/pkg/tsdb/graphite/graphite_test.go index f953badb17a..24b81b62af5 100644 --- a/pkg/tsdb/graphite/graphite_test.go +++ b/pkg/tsdb/graphite/graphite_test.go @@ -6,7 +6,7 @@ import ( ) func TestGraphiteFunctions(t *testing.T) { - Convey("Testing Graphite Executor", t, func() { + Convey("Testing Graphite Functions", t, func() { Convey("formatting time range for now", func() {