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
7b656097
Unverified
Commit
7b656097
authored
Oct 17, 2018
by
Marcus Efraimsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
postgres: use arrow function declaration of interpolateVariable
parent
ec0fd96f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
public/app/plugins/datasource/postgres/datasource.ts
+5
-7
No files found.
public/app/plugins/datasource/postgres/datasource.ts
View file @
7b656097
...
@@ -20,7 +20,7 @@ export class PostgresDatasource {
...
@@ -20,7 +20,7 @@ export class PostgresDatasource {
this
.
interval
=
(
instanceSettings
.
jsonData
||
{}).
timeInterval
;
this
.
interval
=
(
instanceSettings
.
jsonData
||
{}).
timeInterval
;
}
}
interpolateVariable
(
value
,
variable
)
{
interpolateVariable
=
(
value
,
variable
)
=>
{
if
(
typeof
value
===
'string'
)
{
if
(
typeof
value
===
'string'
)
{
if
(
variable
.
multi
||
variable
.
includeAll
)
{
if
(
variable
.
multi
||
variable
.
includeAll
)
{
return
this
.
queryModel
.
quoteLiteral
(
value
);
return
this
.
queryModel
.
quoteLiteral
(
value
);
...
@@ -37,7 +37,7 @@ export class PostgresDatasource {
...
@@ -37,7 +37,7 @@ export class PostgresDatasource {
return
this
.
queryModel
.
quoteLiteral
(
v
);
return
this
.
queryModel
.
quoteLiteral
(
v
);
});
});
return
quotedValues
.
join
(
','
);
return
quotedValues
.
join
(
','
);
}
}
;
query
(
options
)
{
query
(
options
)
{
const
queries
=
_
.
filter
(
options
.
targets
,
target
=>
{
const
queries
=
_
.
filter
(
options
.
targets
,
target
=>
{
...
@@ -50,7 +50,7 @@ export class PostgresDatasource {
...
@@ -50,7 +50,7 @@ export class PostgresDatasource {
intervalMs
:
options
.
intervalMs
,
intervalMs
:
options
.
intervalMs
,
maxDataPoints
:
options
.
maxDataPoints
,
maxDataPoints
:
options
.
maxDataPoints
,
datasourceId
:
this
.
id
,
datasourceId
:
this
.
id
,
rawSql
:
queryModel
.
render
(
(
value
,
variable
)
=>
this
.
interpolateVariable
(
value
,
variable
)
),
rawSql
:
queryModel
.
render
(
this
.
interpolateVariable
),
format
:
target
.
format
,
format
:
target
.
format
,
};
};
});
});
...
@@ -82,9 +82,7 @@ export class PostgresDatasource {
...
@@ -82,9 +82,7 @@ export class PostgresDatasource {
const
query
=
{
const
query
=
{
refId
:
options
.
annotation
.
name
,
refId
:
options
.
annotation
.
name
,
datasourceId
:
this
.
id
,
datasourceId
:
this
.
id
,
rawSql
:
this
.
templateSrv
.
replace
(
options
.
annotation
.
rawQuery
,
options
.
scopedVars
,
(
value
,
variable
)
=>
rawSql
:
this
.
templateSrv
.
replace
(
options
.
annotation
.
rawQuery
,
options
.
scopedVars
,
this
.
interpolateVariable
),
this
.
interpolateVariable
(
value
,
variable
)
),
format
:
'table'
,
format
:
'table'
,
};
};
...
@@ -110,7 +108,7 @@ export class PostgresDatasource {
...
@@ -110,7 +108,7 @@ export class PostgresDatasource {
const
interpolatedQuery
=
{
const
interpolatedQuery
=
{
refId
:
refId
,
refId
:
refId
,
datasourceId
:
this
.
id
,
datasourceId
:
this
.
id
,
rawSql
:
this
.
templateSrv
.
replace
(
query
,
{},
(
value
,
variable
)
=>
this
.
interpolateVariable
(
value
,
variable
)
),
rawSql
:
this
.
templateSrv
.
replace
(
query
,
{},
this
.
interpolateVariable
),
format
:
'table'
,
format
:
'table'
,
};
};
...
...
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