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

stackdriver: fix broken substring. also adds tests

Browse Source
This commit is contained in:
Erik Sundell 2018-10-02 17:29:51 +02:00
parent 2e665fba0f
commit 68332c5951
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,8 +170,11 @@ func reverse(s string) string {
} }
func interpolateFilterWildcards(value string) string { func interpolateFilterWildcards(value string) string {
if strings.HasSuffix(value, "*") && strings.HasPrefix(value, "*") { re := regexp.MustCompile("[*]")
value = strings.Replace(value, "*", "", 1) matches := re.FindAllStringIndex(value, -1)
logger.Info("len", "len", len(matches))
if len(matches) == 2 && strings.HasSuffix(value, "*") && strings.HasPrefix(value, "*") {
value = strings.Replace(value, "*", "", -1)
value = fmt.Sprintf(`has_substring("%s")`, value) value = fmt.Sprintf(`has_substring("%s")`, value)
} else if strings.HasPrefix(value, "*") { } else if strings.HasPrefix(value, "*") {
value = strings.Replace(value, "*", "", 1) value = strings.Replace(value, "*", "", 1)

13
pkg/tsdb/stackdriver/stackdriver_test.go
View File

@ -342,6 +342,19 @@ func TestStackdriver(t *testing.T) {
}) })
}) })
}) })
Convey("when interpolating filter wildcards", func() {
Convey("and wildcard is used in the beginning and the end of the word", func() {
Convey("and theres no wildcard in the middle of the word", func() {
value := interpolateFilterWildcards("*-central1*")
So(value, ShouldEqual, `has_substring("-central1")`)
})
Convey("and there is a wildcard in the middle of the word", func() {
value := interpolateFilterWildcards("*-cent*ral1*")
So(value, ShouldNotStartWith, `has_substring`)
})
})
})
}) })
} }