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

fix: query editor needs to wait for function definitions to load

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-01-12 12:31:27 +01:00 committed by Dan Cech
parent b483d42d34
commit 7e750cef43
No known key found for this signature in database
GPG Key ID: 6F1146C5B66FBD41
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
public/app/plugins/datasource/graphite/datasource.ts
View File

@ -14,6 +14,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
this.withCredentials = instanceSettings.withCredentials;
this.render_method = instanceSettings.render_method || 'POST';
this.funcDefs = null;
this.funcDefsPromise = null;
this.getQueryOptionsInfo = function() {
return {
@ -412,16 +413,19 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
return gfunc.getFuncDef(name, this.funcDefs);
};
this.getFuncDefs = function() {
let self = this;
this.waitForFuncDefsLoaded = function() {
return this.getFuncDefs();
};
if (self.funcDefs !== null) {
return Promise.resolve(self.funcDefs);
this.getFuncDefs = function() {
if (this.funcDefsPromise !== null) {
return this.funcDefsPromise;
}
if (!supportsFunctionIndex(self.graphiteVersion)) {
self.funcDefs = gfunc.getFuncDefs(self.graphiteVersion);
return Promise.resolve(self.funcDefs);
if (!supportsFunctionIndex(this.graphiteVersion)) {
this.funcDefs = gfunc.getFuncDefs(this.graphiteVersion);
this.funcDefsPromise = Promise.resolve(this.funcDefs);
return this.funcDefsPromise;
}
let httpOptions = {
@ -429,15 +433,15 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
url: '/functions',
};
self.funcDefs = self
.doGraphiteRequest(httpOptions)
this.funcDefsPromise = this.doGraphiteRequest(httpOptions)
.then(results => {
if (results.status !== 200 || typeof results.data !== 'object') {
self.funcDefs = gfunc.getFuncDefs(self.graphiteVersion);
return Promise.resolve(self.funcDefs);
this.funcDefs = gfunc.getFuncDefs(this.graphiteVersion);
return Promise.resolve(this.funcDefs);
}
self.funcDefs = {};
this.funcDefs = {};
_.forEach(results.data || {}, (funcDef, funcName) => {
// skip graphite graph functions
if (funcDef.group === 'Graph') {
@ -522,16 +526,17 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
func.params.push(param);
});
self.funcDefs[funcName] = func;
this.funcDefs[funcName] = func;
});
return self.funcDefs;
return this.funcDefs;
})
.catch(err => {
self.funcDefs = gfunc.getFuncDefs(self.graphiteVersion);
return self.funcDefs;
console.log('Fetching graphite functions error', err);
this.funcDefs = gfunc.getFuncDefs(this.graphiteVersion);
return this.funcDefs;
});
return self.funcDefs;
return this.funcDefsPromise;
};
this.testDatasource = function() {

8
public/app/plugins/datasource/graphite/query_ctrl.ts
View File

@ -20,16 +20,16 @@ export class GraphiteQueryCtrl extends QueryCtrl {
paused: boolean;
/** @ngInject **/
constructor($scope, $injector, private uiSegmentSrv, private templateSrv) {
constructor($scope, $injector, private uiSegmentSrv, private templateSrv, $timeout) {
super($scope, $injector);
this.supportsTags = this.datasource.supportsTags;
this.paused = false;
this.target.target = this.target.target || '';
if (this.target) {
this.target.target = this.target.target || '';
this.datasource.waitForFuncDefsLoaded().then(() => {
this.queryModel = new GraphiteQuery(this.datasource, this.target, templateSrv);
this.buildSegments();
}
});
this.removeTagValue = '-- remove tag --';
}