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

Create cacheKey at top-level

Browse Source 
Responsibility is now to pass the cacheKey through
to `datasourceRequest` in each datasources'
implementation of `query`.
This commit is contained in:
stuart nelson 2016-06-09 11:36:46 +02:00
parent 18f9f6c159
commit bc7c2cd3f5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/panel/metrics_panel_ctrl.ts
View File

@ -182,6 +182,10 @@ class MetricsPanelCtrl extends PanelCtrl {
cacheTimeout: this.panel.cacheTimeout cacheTimeout: this.panel.cacheTimeout
}; };
metricsQuery.targets.forEach(function(target) {
target.cacheKey = target.expr + target.refId + metricsQuery.panelId;
});
return datasource.query(metricsQuery); return datasource.query(metricsQuery);
} }

5
public/app/plugins/datasource/prometheus/datasource.ts
View File

@ -25,7 +25,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
var options: any = { var options: any = {
url: this.url + url, url: this.url + url,
method: method, method: method,
cacheKey: cacheKey cacheKey: cacheKey,
}; };
if (this.basicAuth || this.withCredentials) { if (this.basicAuth || this.withCredentials) {
@ -76,6 +76,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
var query: any = {}; var query: any = {};
query.expr = templateSrv.replace(target.expr, options.scopedVars, self.interpolateQueryExpr); query.expr = templateSrv.replace(target.expr, options.scopedVars, self.interpolateQueryExpr);
query.cacheKey = target.cacheKey;
var interval = target.interval || options.interval; var interval = target.interval || options.interval;
var intervalFactor = target.intervalFactor || 1; var intervalFactor = target.intervalFactor || 1;
@ -123,7 +124,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
this.performTimeSeriesQuery = function(query, start, end) { this.performTimeSeriesQuery = function(query, start, end) {
var url = '/api/v1/query_range?query=' + encodeURIComponent(query.expr) + '&start=' + start + '&end=' + end + '&step=' + query.step; var url = '/api/v1/query_range?query=' + encodeURIComponent(query.expr) + '&start=' + start + '&end=' + end + '&step=' + query.step;
return this._request('GET', url, query.expr.toString()); return this._request('GET', url, query.cacheKey);
}; };
this.performSuggestQuery = function(query) { this.performSuggestQuery = function(query) {