Commit 56136a53 by Marcus Efraimsson

fix native annotation filtered by template variable with pipe

parent 3d994b16
......@@ -57,10 +57,17 @@ class GrafanaDatasource {
if (!_.isArray(options.annotation.tags) || options.annotation.tags.length === 0) {
return this.$q.when([]);
}
const delimiter = '__delimiter__';
const tags = [];
for (const t of params.tags) {
const renderedValues = this.templateSrv.replace(t, {}, 'pipe');
for (const tt of renderedValues.split('|')) {
const renderedValues = this.templateSrv.replace(t, {}, value => {
if (typeof value === 'string') {
return value;
}
return value.join(delimiter);
});
for (const tt of renderedValues.split(delimiter)) {
tags.push(tt);
}
}
......
......@@ -14,7 +14,7 @@ describe('grafana data source', () => {
const templateSrvStub = {
replace: val => {
return val.replace('$var2', 'replaced|replaced2').replace('$var', 'replaced');
return val.replace('$var2', 'replaced__delimiter__replaced2').replace('$var', 'replaced');
},
};
......
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