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
93630836
Commit
93630836
authored
Jun 03, 2019
by
Matthias Steffen
Committed by
Torkel Ödegaard
Jun 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
InfluxDB: Fixes single quotes are not escaped (#17398)
Fixes #17397
parent
76e5657b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletions
+21
-1
public/app/plugins/datasource/influxdb/influx_query.ts
+1
-1
public/app/plugins/datasource/influxdb/specs/influx_query.test.ts
+20
-0
No files found.
public/app/plugins/datasource/influxdb/influx_query.ts
View file @
93630836
...
@@ -146,7 +146,7 @@ export default class InfluxQuery {
...
@@ -146,7 +146,7 @@ export default class InfluxQuery {
value
=
this
.
templateSrv
.
replace
(
value
,
this
.
scopedVars
);
value
=
this
.
templateSrv
.
replace
(
value
,
this
.
scopedVars
);
}
}
if
(
operator
!==
'>'
&&
operator
!==
'<'
)
{
if
(
operator
!==
'>'
&&
operator
!==
'<'
)
{
value
=
"'"
+
value
.
replace
(
/
\\
/g
,
'
\\\
\'
) + "'
";
value
=
"'"
+
value
.
replace
(
/
\\
/g
,
'
\\\
\'
)
.replace(/
\'
/g, "
\
\'
")
+ "'
";
}
}
} else if (interpolate) {
} else if (interpolate) {
value = this.templateSrv.replace(value, this.scopedVars, 'regex');
value = this.templateSrv.replace(value, this.scopedVars, 'regex');
...
...
public/app/plugins/datasource/influxdb/specs/influx_query.test.ts
View file @
93630836
...
@@ -139,6 +139,26 @@ describe('InfluxQuery', () => {
...
@@ -139,6 +139,26 @@ describe('InfluxQuery', () => {
});
});
});
});
describe
(
'field name with single quote should be escaped and'
,
()
=>
{
it
(
'should generate correct query'
,
()
=>
{
const
query
=
new
InfluxQuery
(
{
measurement
:
'cpu'
,
groupBy
:
[{
type
:
'time'
,
params
:
[
'auto'
]
}],
tags
:
[{
key
:
'name'
,
value
:
"Let's encrypt."
},
{
key
:
'hostname'
,
value
:
'server2'
,
condition
:
'OR'
}],
},
templateSrv
,
{}
);
const
queryText
=
query
.
render
();
expect
(
queryText
).
toBe
(
'SELECT mean("value") FROM "cpu" WHERE ("name" =
\'
Let
\\
\'
s encrypt.
\'
OR "hostname" =
\'
server2
\'
) AND '
+
'$timeFilter GROUP BY time($__interval)'
);
});
});
describe
(
'query with value condition'
,
()
=>
{
describe
(
'query with value condition'
,
()
=>
{
it
(
'should not quote value'
,
()
=>
{
it
(
'should not quote value'
,
()
=>
{
const
query
=
new
InfluxQuery
(
const
query
=
new
InfluxQuery
(
...
...
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