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

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-11 16:31:31 +02:00
commit 910e54d75e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/plugins/datasource/prometheus/query_ctrl.ts
View File

@ -78,15 +78,15 @@ class PrometheusQueryCtrl extends QueryCtrl {
var rangeDiff = Math.ceil((range.to.valueOf() - range.from.valueOf()) / 1000); var rangeDiff = Math.ceil((range.to.valueOf() - range.from.valueOf()) / 1000);
var endTime = range.to.utc().format('YYYY-MM-DD HH:mm'); var endTime = range.to.utc().format('YYYY-MM-DD HH:mm');
var expr = { var expr = {
expr: this.templateSrv.replace(this.target.expr, this.panelCtrl.panel.scopedVars, this.datasource.interpolateQueryExpr), 'g0.expr': this.templateSrv.replace(this.target.expr, this.panelCtrl.panel.scopedVars, this.datasource.interpolateQueryExpr),
range_input: rangeDiff + 's', 'g0.range_input': rangeDiff + 's',
end_input: endTime, 'g0.end_input': endTime,
step_input: this.target.step, 'g0.step_input': this.target.step,
stacked: this.panelCtrl.panel.stack, 'g0.stacked': this.panelCtrl.panel.stack ? 1 : 0,
tab: 0 'g0.tab': 0
}; };
var hash = encodeURIComponent(JSON.stringify([expr])); var args = _.map(expr, (v, k) => { return k + '=' + encodeURIComponent(v); }).join('&');
this.linkToPrometheus = this.datasource.directUrl + '/graph#' + hash; this.linkToPrometheus = this.datasource.directUrl + '/graph?' + args;
} }
getCollapsedText() { getCollapsedText() {