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 pull request #3892 from pfischermx/master

Browse Source 
Allow the use of auth and credentials in opentsdb
This commit is contained in:
Torkel Ödegaard 2016-02-01 11:01:15 +01:00
commit 2e20c680cb
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,8 @@ function (angular, _, dateMath) {
this.type = 'opentsdb'; this.type = 'opentsdb';
this.url = instanceSettings.url; this.url = instanceSettings.url;
this.name = instanceSettings.name; this.name = instanceSettings.name;
this.withCredentials = instanceSettings.withCredentials;
this.basicAuth = instanceSettings.basicAuth;
this.supportMetrics = true; this.supportMetrics = true;
// Called once per panel (graph) // Called once per panel (graph)
@ -71,6 +73,14 @@ function (angular, _, dateMath) {
url: this.url + '/api/query', url: this.url + '/api/query',
data: reqBody data: reqBody
}; };
if (this.basicAuth || this.withCredentials) {
options.withCredentials = true;
}
if (this.basicAuth) {
options.headers = {
"Authorization": this.basicAuth
};
}
// In case the backend is 3rd-party hosted and does not suport OPTIONS, urlencoded requests // In case the backend is 3rd-party hosted and does not suport OPTIONS, urlencoded requests
// go as POST rather than OPTIONS+POST // go as POST rather than OPTIONS+POST