Commit bb64e812 by Theral Mackey Committed by Torkel Ödegaard

Bugfix for Basic Auth: strip auth from url before using

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.
parent 9a324e35
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment