Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
5f7795aa
Commit
5f7795aa
authored
Oct 02, 2018
by
Erik Sundell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stackdriver: test that no interpolation is done when there are no wildcards
parent
2a0d7a88
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletions
+7
-1
pkg/tsdb/stackdriver/stackdriver.go
+1
-1
pkg/tsdb/stackdriver/stackdriver_test.go
+6
-0
No files found.
pkg/tsdb/stackdriver/stackdriver.go
View file @
5f7795aa
...
@@ -179,7 +179,7 @@ func interpolateFilterWildcards(value string) string {
...
@@ -179,7 +179,7 @@ func interpolateFilterWildcards(value string) string {
}
else
if
matches
==
1
&&
strings
.
HasSuffix
(
value
,
"*"
)
{
}
else
if
matches
==
1
&&
strings
.
HasSuffix
(
value
,
"*"
)
{
value
=
reverse
(
strings
.
Replace
(
reverse
(
value
),
"*"
,
""
,
1
))
value
=
reverse
(
strings
.
Replace
(
reverse
(
value
),
"*"
,
""
,
1
))
value
=
fmt
.
Sprintf
(
`starts_with("%s")`
,
value
)
value
=
fmt
.
Sprintf
(
`starts_with("%s")`
,
value
)
}
else
if
matches
==
1
{
}
else
if
matches
!=
0
{
re
:=
regexp
.
MustCompile
(
`[-\/^$+?.()|[\]{}]`
)
re
:=
regexp
.
MustCompile
(
`[-\/^$+?.()|[\]{}]`
)
value
=
string
(
re
.
ReplaceAllFunc
([]
byte
(
value
),
func
(
in
[]
byte
)
[]
byte
{
value
=
string
(
re
.
ReplaceAllFunc
([]
byte
(
value
),
func
(
in
[]
byte
)
[]
byte
{
return
[]
byte
(
strings
.
Replace
(
string
(
in
),
string
(
in
),
`\\`
+
string
(
in
),
1
))
return
[]
byte
(
strings
.
Replace
(
string
(
in
),
string
(
in
),
`\\`
+
string
(
in
),
1
))
...
...
pkg/tsdb/stackdriver/stackdriver_test.go
View file @
5f7795aa
...
@@ -398,7 +398,13 @@ func TestStackdriver(t *testing.T) {
...
@@ -398,7 +398,13 @@ func TestStackdriver(t *testing.T) {
value
:=
interpolateFilterWildcards
(
"us-ce*tral1-*"
)
value
:=
interpolateFilterWildcards
(
"us-ce*tral1-*"
)
So
(
value
,
ShouldEqual
,
`monitoring.regex.full_match("^us\\-ce.*tral1\\-.*$")`
)
So
(
value
,
ShouldEqual
,
`monitoring.regex.full_match("^us\\-ce.*tral1\\-.*$")`
)
})
})
Convey
(
"and no wildcard is used"
,
func
()
{
value
:=
interpolateFilterWildcards
(
"us-central1-a}"
)
So
(
value
,
ShouldEqual
,
`us-central1-a}`
)
})
})
})
})
})
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment