Commit cbefd8f8 by joelanford Committed by Torkel Ödegaard

Fixed legend labeling bug in Prometheus datasource (#4858)

parent 736ee3ff
...@@ -63,11 +63,14 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS ...@@ -63,11 +63,14 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
var end = getPrometheusTime(options.range.to, true); var end = getPrometheusTime(options.range.to, true);
var queries = []; var queries = [];
var activeTargets = [];
options = _.clone(options); options = _.clone(options);
_.each(options.targets, _.bind(function(target) { _.each(options.targets, _.bind(function(target) {
if (!target.expr || target.hide) { if (!target.expr || target.hide) {
return; return;
} }
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, interpolateQueryExpr);
...@@ -109,7 +112,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS ...@@ -109,7 +112,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
delete self.lastErrors.query; delete self.lastErrors.query;
_.each(response.data.data.result, function(metricData) { _.each(response.data.data.result, function(metricData) {
result.push(self.transformMetricData(metricData, options.targets[index], start, end)); result.push(self.transformMetricData(metricData, activeTargets[index], start, end));
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment