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

Revert "feat(influxdb): add support for 0.11.0 tags"

Browse Source 
This reverts commit b73d196c6b.
This commit is contained in:
bergquist 2016-03-22 16:04:54 +01:00
parent 04a887dafa
commit 83b7397398
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/plugins/datasource/influxdb/datasource.ts
View File

@ -109,7 +109,7 @@ export function InfluxDatasource(instanceSettings, $q, backendSrv, templateSrv)
return $q.reject(err); return $q.reject(err);
} }
return this._seriesQuery(interpolated).then((results) => { return this._seriesQuery(interpolated).then(function (results) {
if (!results || results.results.length === 0) { return []; } if (!results || results.results.length === 0) { return []; }
var influxResults = results.results[0]; var influxResults = results.results[0];
@ -118,9 +118,9 @@ export function InfluxDatasource(instanceSettings, $q, backendSrv, templateSrv)
} }
var series = influxResults.series[0]; var series = influxResults.series[0];
return _.map(series.values, (value) => { return _.map(series.values, function(value) {
if (_.isArray(value)) { if (_.isArray(value)) {
return { text: this.getValueBasedOnInfluxVersion(value) }; return { text: value[0] };
} else { } else {
return { text: value }; 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) { this._seriesQuery = function(query) {
return this._influxRequest('GET', '/query', {q: query, epoch: 'ms'}); return this._influxRequest('GET', '/query', {q: query, epoch: 'ms'});
}; };