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-10-28 13:28:30 +02:00
parent 3e3cef28ec cdd17f4871
commit d03b0d664b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/opentsdb/datasource.js
View File

@@ -441,7 +441,7 @@ function (angular, _, dateMath) {
} }
function mapMetricsToTargets(metrics, options, tsdbVersion) { function mapMetricsToTargets(metrics, options, tsdbVersion) {
var interpolatedTagValue; var interpolatedTagValue, arrTagV;
return _.map(metrics, function(metricData) { return _.map(metrics, function(metricData) {
if (tsdbVersion === 3) { if (tsdbVersion === 3) {
return metricData.query.index; return metricData.query.index;
@@ -453,7 +453,8 @@ function (angular, _, dateMath) {
return target.metric === metricData.metric && return target.metric === metricData.metric &&
_.every(target.tags, function(tagV, tagK) { _.every(target.tags, function(tagV, tagK) {
interpolatedTagValue = templateSrv.replace(tagV, options.scopedVars, 'pipe'); interpolatedTagValue = templateSrv.replace(tagV, options.scopedVars, 'pipe');
return metricData.tags[tagK] === interpolatedTagValue || interpolatedTagValue === "*"; arrTagV = interpolatedTagValue.split('|');
return _.includes(arrTagV, metricData.tags[tagK]) || interpolatedTagValue === "*";
}); });
} }
}); });