Commit b483d42d by Dan Cech

fix issue with metric find & functions being loaded multiple times

parent 60ba6ee6
......@@ -429,7 +429,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
url: '/functions',
};
return self
self.funcDefs = self
.doGraphiteRequest(httpOptions)
.then(results => {
if (results.status !== 200 || typeof results.data !== 'object') {
......@@ -530,6 +530,8 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
self.funcDefs = gfunc.getFuncDefs(self.graphiteVersion);
return self.funcDefs;
});
return self.funcDefs;
};
this.testDatasource = function() {
......
......@@ -106,7 +106,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
}
getAltSegments(index, prefix) {
var query = '*' + prefix + '*';
var query = prefix && prefix.length > 0 ? '*' + prefix + '*' : '*';
if (index > 0) {
query = this.queryModel.getSegmentPathUpTo(index) + '.' + query;
}
......
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