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
fe0b7533
Commit
fe0b7533
authored
May 03, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(influxdb): quote number valued tag values, only not quote when operator is > or <, fixes #4885
parent
152e0853
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletions
+14
-1
public/app/plugins/datasource/influxdb/influx_query.ts
+1
-1
public/app/plugins/datasource/influxdb/specs/influx_query_specs.ts
+13
-0
No files found.
public/app/plugins/datasource/influxdb/influx_query.ts
View file @
fe0b7533
...
@@ -152,7 +152,7 @@ export default class InfluxQuery {
...
@@ -152,7 +152,7 @@ export default class InfluxQuery {
if
(
interpolate
)
{
if
(
interpolate
)
{
value
=
this
.
templateSrv
.
replace
(
value
,
this
.
scopedVars
);
value
=
this
.
templateSrv
.
replace
(
value
,
this
.
scopedVars
);
}
}
if
(
isNaN
(
+
value
)
)
{
if
(
operator
!==
'>'
&&
operator
!==
'<'
)
{
value
=
"'"
+
value
.
replace
(
'
\
\'
, '
\\\\
') + "'
";
value
=
"'"
+
value
.
replace
(
'
\
\'
, '
\\\\
') + "'
";
}
}
} else if (interpolate){
} else if (interpolate){
...
...
public/app/plugins/datasource/influxdb/specs/influx_query_specs.ts
View file @
fe0b7533
...
@@ -101,6 +101,19 @@ describe('InfluxQuery', function() {
...
@@ -101,6 +101,19 @@ describe('InfluxQuery', function() {
});
});
});
});
describe
(
'query with value condition'
,
function
()
{
it
(
'should not quote value'
,
function
()
{
var
query
=
new
InfluxQuery
({
measurement
:
'cpu'
,
groupBy
:
[],
tags
:
[{
key
:
'value'
,
value
:
'5'
,
operator
:
'>'
}]
},
templateSrv
,
{});
var
queryText
=
query
.
render
();
expect
(
queryText
).
to
.
be
(
'SELECT mean("value") FROM "cpu" WHERE "value" > 5 AND $timeFilter'
);
});
});
describe
(
'series with groupByTag'
,
function
()
{
describe
(
'series with groupByTag'
,
function
()
{
it
(
'should generate correct query'
,
function
()
{
it
(
'should generate correct query'
,
function
()
{
var
query
=
new
InfluxQuery
({
var
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