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

src/app/services/influxdb/influxdbDatasource.js

@@ -138,6 +138,7 @@ function (angular, _, kbn) {
         var params = {
         var params = {
           u: _this.username,
           u: _this.username,
           p: _this.password,
           p: _this.password,
+          time_precision: 's',
           q: query
           q: query
         };
         };
 
 
@@ -171,9 +172,7 @@ function (angular, _, kbn) {
           var datapoints = [];
           var datapoints = [];
 
 
           for(var i = 0; i < series.points.length; i++) {
           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 });
           output.push({ target:target, datapoints:datapoints });