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

Bugfix for Basic Auth: strip auth from url before using

Browse Source 
This fixes the Basic Auth not working issue (issue#16) further, by
removing the auth string from the URL before grafana attempts to use
it. Some js doesn't handle it properly and tries to include the auth
string in dns lookups(?), so the request never even hits the graphite
server when an auth string is present.
This commit is contained in:
Theral Mackey 2014-02-25 16:06:44 -08:00 committed by Torkel Ödegaard
parent 9a324e35a4
commit bb64e812d8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,15 @@ function (angular, _, $, config, kbn, moment) {
module.factory('GraphiteDatasource', function(dashboard, $q, filterSrv, $http) {
function GraphiteDatasource(datasource) {
this.url = datasource.url;
var passwordEnd = datasource.url.indexOf('@');
if(passwordEnd > 0) {
var userStart = datasource.url.indexOf('//') + 2;
var urlHead = datasource.url.substring(0,userStart);
this.url = urlHead + datasource.url.substring(passwordEnd);
}
else {
this.url = datasource.url;
}
this.type = 'graphite';
this.basicAuth = datasource.basicAuth;
}