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 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-06-17 14:16:25 +02:00
commit e2b398a6bf
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/app/plugins/datasource/opentsdb/datasource.js
View File

@ -128,13 +128,7 @@ function (angular, _, dateMath) {
data: reqBody
};
if (this.basicAuth || this.withCredentials) {
options.withCredentials = true;
}
if (this.basicAuth) {
options.headers = {"Authorization": this.basicAuth};
}
this._addCredentialOptions(options);
// In case the backend is 3rd-party hosted and does not suport OPTIONS, urlencoded requests
// go as POST rather than OPTIONS+POST
@ -210,11 +204,24 @@ function (angular, _, dateMath) {
};
this._get = function(relativeUrl, params) {
return backendSrv.datasourceRequest({
var options = {
method: 'GET',
url: this.url + relativeUrl,
params: params,
});
};
this._addCredentialOptions(options);
return backendSrv.datasourceRequest(options);
};
this._addCredentialOptions = function(options) {
if (this.basicAuth || this.withCredentials) {
options.withCredentials = true;
}
if (this.basicAuth) {
options.headers = {"Authorization": this.basicAuth};
}
};
this.metricFindQuery = function(query) {
@ -435,7 +442,6 @@ function (angular, _, dateMath) {
date = dateMath.parse(date, roundUp);
return date.valueOf();
}
}
return {