public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(prometheus) fix prometheus link (#5074)

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2016-05-18 07:49:32 +02:00
committed by Torkel Ödegaard
parent 8a9455d901
commit fc1891320e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/prometheus/datasource.ts
+4 -4
View File
@@ -43,7 +43,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
return value.replace(/[\\^$*+?.()|[\]{}]/g, '\\\\$&'); return value.replace(/[\\^$*+?.()|[\]{}]/g, '\\\\$&');
} }
function interpolateQueryExpr(value, variable, defaultFormatFn) { this.interpolateQueryExpr = function(value, variable, defaultFormatFn) {
// if no multi or include all do not regexEscape // if no multi or include all do not regexEscape
if (!variable.multi && !variable.includeAll) { if (!variable.multi && !variable.includeAll) {
return value; return value;
@@ -59,6 +59,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
// Called once per panel (graph) // Called once per panel (graph)
this.query = function(options) { this.query = function(options) {
var self = this;
var start = getPrometheusTime(options.range.from, false); var start = getPrometheusTime(options.range.from, false);
var end = getPrometheusTime(options.range.to, true); var end = getPrometheusTime(options.range.to, true);
@@ -73,7 +74,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
activeTargets.push(target); activeTargets.push(target);
var query: any = {}; var query: any = {};
query.expr = templateSrv.replace(target.expr, options.scopedVars, interpolateQueryExpr); query.expr = templateSrv.replace(target.expr, options.scopedVars, self.interpolateQueryExpr);
var interval = target.interval || options.interval; var interval = target.interval || options.interval;
var intervalFactor = target.intervalFactor || 1; var intervalFactor = target.intervalFactor || 1;
@@ -99,7 +100,6 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
return this.performTimeSeriesQuery(query, start, end); return this.performTimeSeriesQuery(query, start, end);
}, this)); }, this));
var self = this;
return $q.all(allQueryPromise) return $q.all(allQueryPromise)
.then(function(allResponse) { .then(function(allResponse) {
var result = []; var result = [];
@@ -160,7 +160,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
var interpolated; var interpolated;
try { try {
interpolated = templateSrv.replace(expr, {}, interpolateQueryExpr); interpolated = templateSrv.replace(expr, {}, this.interpolateQueryExpr);
} catch (err) { } catch (err) {
return $q.reject(err); return $q.reject(err);
} }
public/app/plugins/datasource/prometheus/query_ctrl.ts
+1 -1
View File
@@ -61,7 +61,7 @@ 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), expr: this.templateSrv.replace(this.target.expr, this.panelCtrl.panel.scopedVars, this.datasource.interpolateQueryExpr),
range_input: rangeDiff + 's', range_input: rangeDiff + 's',
end_input: endTime, end_input: endTime,
step_input: '', step_input: '',