IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'influxdb' of github.com:pmenglund/grafana into pmenglund-influxdb

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-05-10 01:41:25 +02:00
parent de8d456089 9dfb03aa0f
commit 5ad95a1c3e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/services/influxdb/influxdbDatasource.js
View File

@@ -138,6 +138,7 @@ function (angular, _, kbn) {
var params = {
u: _this.username,
p: _this.password,
time_precision: 's',
q: query
};
@@ -171,9 +172,7 @@ function (angular, _, kbn) {
var datapoints = [];
for(var i = 0; i < series.points.length; i++) {
var t = Math.floor(series.points[i][timeCol] / 1000);
var v = series.points[i][index];
datapoints[i] = [v,t];
datapoints[i] = [series.points[i][index], series.points[i][timeCol]];
}
output.push({ target:target, datapoints:datapoints });