opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-28 11:23:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
ryan
2018-03-15 10:35:50 +01:00
parent 853d9bb378
commit 3aed867b4b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,10 +228,10 @@ export default class InfluxDatasource {
} }
_influxRequest(method: string, url: string, data: any, options?: any) { _influxRequest(method: string, url: string, data: any, options?: any) {
var currentUrl = this.urls.shift(); const currentUrl = this.urls.shift();
this.urls.push(currentUrl); this.urls.push(currentUrl);
var params: any = {}; let params: any = {};
if (this.username) { if (this.username) {
params.u = this.username; params.u = this.username;
@ -252,7 +252,7 @@ export default class InfluxDatasource {
data = null; data = null;
} }
var req: any = { let req: any = {
method: method, method: method,
url: currentUrl + url, url: currentUrl + url,
params: params, params: params,
@ -270,7 +270,7 @@ export default class InfluxDatasource {
req.headers.Authorization = this.basicAuth; req.headers.Authorization = this.basicAuth;
} }
return this.backendSrv.datasourceRequest(options).then( return this.backendSrv.datasourceRequest(req).then(
result => { result => {
return result.data; return result.data;
}, },