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

feat(datasource): cancel in flight data source requests, refeatoring #5321

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-06-16 10:48:26 +02:00
parent 6d3521c240
commit 81e9aa4de4
6 changed files with 205 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,13 +30,17 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
return $q.when({data: []});
}
var httpOptions: any = {method: this.render_method, url: '/render'};
var httpOptions: any = {
method: 'POST',
url: '/render',
data: params.join('&'),
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
},
};
if (httpOptions.method === 'GET') {
httpOptions.url = httpOptions.url + '?' + params.join('&');
} else {
httpOptions.data = params.join('&');
httpOptions.headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
if (options.panelId) {
httpOptions.requestId = 'panel' + options.panelId;
}
return this.doGraphiteRequest(httpOptions).then(this.convertDataPointsToMs);
@@ -177,17 +181,6 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
});
};
this.listDashboards = function(query) {
return this.doGraphiteRequest({ method: 'GET', url: '/dashboard/find/', params: {query: query || ''} })
.then(function(results) {
return results.data.dashboards;
});
};
this.loadDashboard = function(dashName) {
return this.doGraphiteRequest({method: 'GET', url: '/dashboard/load/' + encodeURIComponent(dashName) });
};
this.doGraphiteRequest = function(options) {
if (this.basicAuth || this.withCredentials) {
options.withCredentials = true;
@@ -198,7 +191,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
}
options.url = this.url + options.url;
options.inspect = { type: 'graphite' };
options.inspect = {type: 'graphite'};
return backendSrv.datasourceRequest(options);
};