From c140c8cac9735089db03b1f8b1117757fcf8da2f Mon Sep 17 00:00:00 2001 From: bret barker Date: Mon, 8 Dec 2014 09:35:55 -0500 Subject: [PATCH] fix #1204: add separate datasource parameter withCredentials --- src/app/services/graphite/graphiteDatasource.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/services/graphite/graphiteDatasource.js b/src/app/services/graphite/graphiteDatasource.js index ee1312f7bd7..cfaca71aa3d 100644 --- a/src/app/services/graphite/graphiteDatasource.js +++ b/src/app/services/graphite/graphiteDatasource.js @@ -24,6 +24,7 @@ function (angular, _, $, config, kbn, moment) { this.supportMetrics = true; this.annotationEditorSrc = 'app/partials/graphite/annotation_editor.html'; this.cacheTimeout = datasource.cacheTimeout; + this.withCredentials = datasource.withCredentials; } GraphiteDatasource.prototype.query = function(options) { @@ -209,8 +210,10 @@ function (angular, _, $, config, kbn, moment) { }; GraphiteDatasource.prototype.doGraphiteRequest = function(options) { - if (this.basicAuth) { + if (this.basicAuth || this.withCredentials) { options.withCredentials = true; + } + if (this.basicAuth) { options.headers = options.headers || {}; options.headers.Authorization = 'Basic ' + this.basicAuth; }