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
83b73973
Commit
83b73973
authored
Mar 22, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "feat(influxdb): add support for 0.11.0 tags"
This reverts commit
b73d196c
.
parent
04a887da
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
public/app/plugins/datasource/influxdb/datasource.ts
+3
-9
No files found.
public/app/plugins/datasource/influxdb/datasource.ts
View file @
83b73973
...
...
@@ -109,7 +109,7 @@ export function InfluxDatasource(instanceSettings, $q, backendSrv, templateSrv)
return
$q
.
reject
(
err
);
}
return
this
.
_seriesQuery
(
interpolated
).
then
(
(
results
)
=>
{
return
this
.
_seriesQuery
(
interpolated
).
then
(
function
(
results
)
{
if
(
!
results
||
results
.
results
.
length
===
0
)
{
return
[];
}
var
influxResults
=
results
.
results
[
0
];
...
...
@@ -118,9 +118,9 @@ export function InfluxDatasource(instanceSettings, $q, backendSrv, templateSrv)
}
var
series
=
influxResults
.
series
[
0
];
return
_
.
map
(
series
.
values
,
(
value
)
=>
{
return
_
.
map
(
series
.
values
,
function
(
value
)
{
if
(
_
.
isArray
(
value
))
{
return
{
text
:
this
.
getValueBasedOnInfluxVersion
(
value
)
};
return
{
text
:
value
[
0
]
};
}
else
{
return
{
text
:
value
};
}
...
...
@@ -128,12 +128,6 @@ export function InfluxDatasource(instanceSettings, $q, backendSrv, templateSrv)
});
};
this
.
getValueBasedOnInfluxVersion
=
function
(
value
)
{
//influxdb 0.10.0 sends the value in first position
//influxdb 0.11.0 sends the value in second position
return
value
[
1
]
||
value
[
0
];
};
this
.
_seriesQuery
=
function
(
query
)
{
return
this
.
_influxRequest
(
'GET'
,
'/query'
,
{
q
:
query
,
epoch
:
'ms'
});
};
...
...
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