root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 82 Packages Projects Releases Wiki Activity

Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x

This commit is contained in:
Torkel Ödegaard 2016-07-11 19:07:32 +02:00
parent 81af8f072c eb35f8cb89
commit 5b4fd8e9c8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
var query: any = {};
query.expr = templateSrv.replace(target.expr, options.scopedVars, self.interpolateQueryExpr);
query.requestId = target.expr;
query.requestId = options.panelId + target.refId;
var interval = target.interval || options.interval;
var intervalFactor = target.intervalFactor || 1;