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 #1205 from noise/master

Browse Source 
fix #1204: add separate datasource parameter withCredentials
This commit is contained in:
Torkel Ödegaard
2014-12-15 15:05:43 +01:00
parent 4ae7648bea c140c8cac9
commit 8a4ff5bddc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/services/graphite/graphiteDatasource.js
View File

@@ -24,6 +24,7 @@ function (angular, _, $, config, kbn, moment) {
this.supportMetrics = true; this.supportMetrics = true;
this.annotationEditorSrc = 'app/partials/graphite/annotation_editor.html'; this.annotationEditorSrc = 'app/partials/graphite/annotation_editor.html';
this.cacheTimeout = datasource.cacheTimeout; this.cacheTimeout = datasource.cacheTimeout;
this.withCredentials = datasource.withCredentials;
} }
GraphiteDatasource.prototype.query = function(options) { GraphiteDatasource.prototype.query = function(options) {
@@ -209,8 +210,10 @@ function (angular, _, $, config, kbn, moment) {
}; };
GraphiteDatasource.prototype.doGraphiteRequest = function(options) { GraphiteDatasource.prototype.doGraphiteRequest = function(options) {
if (this.basicAuth) { if (this.basicAuth || this.withCredentials) {
options.withCredentials = true; options.withCredentials = true;
}
if (this.basicAuth) {
options.headers = options.headers || {}; options.headers = options.headers || {};
options.headers.Authorization = 'Basic ' + this.basicAuth; options.headers.Authorization = 'Basic ' + this.basicAuth;
} }