|
@@ -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
|
|
|
}
|
|
}
|