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
6595be95
Commit
6595be95
authored
Nov 17, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
influxdb: another minor refactor of #9474
parent
37409163
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
public/app/plugins/datasource/influxdb/query_builder.ts
+7
-7
No files found.
public/app/plugins/datasource/influxdb/query_builder.ts
View file @
6595be95
...
...
@@ -49,16 +49,18 @@ export class InfluxQueryBuilder {
}
else
if
(
type
===
'FIELDS'
)
{
measurement
=
this
.
target
.
measurement
;
policy
=
this
.
target
.
policy
;
if
(
!
measurement
.
match
(
'^/.*/'
))
{
measurement
=
'"'
+
measurement
+
'"'
;
if
(
policy
)
{
if
(
!
policy
.
match
(
'^/.*/'
))
{
policy
=
'"'
+
policy
+
'"'
;
}
if
(
policy
&&
policy
!==
'default'
)
{
policy
=
'"'
+
policy
+
'"'
;
measurement
=
policy
+
'.'
+
measurement
;
}
}
return
'SHOW FIELD KEYS FROM '
+
measurement
;
}
else
if
(
type
===
'RETENTION POLICIES'
)
{
query
=
'SHOW RETENTION POLICIES on "'
+
this
.
database
+
'"'
;
return
query
;
...
...
@@ -70,9 +72,7 @@ export class InfluxQueryBuilder {
}
if
(
policy
&&
policy
!==
'default'
)
{
if
(
!
policy
.
match
(
'^/.*/'
)
&&
!
policy
.
match
(
/^merge
\(
.*
\)
/
))
{
policy
=
'"'
+
policy
+
'"'
;
}
policy
=
'"'
+
policy
+
'"'
;
measurement
=
policy
+
'.'
+
measurement
;
}
...
...
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