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

[v10.0.x] TemplateSrv: Fix ad hoc filters not applying correctly when using datasource variables (#76021)

Browse Source 
TemplateSrv: Fix ad hoc filters not applying correctly when using datasource variables (#75977)

(cherry picked from commit 374e2a68f6)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
This commit is contained in:
grafana-delivery-bot[bot]
2023-10-05 13:56:29 +03:00
committed by GitHub
co-authored by kay delaney
parent b74f4eeaa9
commit b57fe8e856
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/templating/template_srv.test.ts
+5 -1
View File
@@ -198,7 +198,7 @@ describe('templateSrv', () => {
{ {
type: 'datasource', type: 'datasource',
name: 'ds', name: 'ds',
current: { value: 'logstash', text: 'logstash' }, current: { value: 'logstash-id', text: 'logstash' },
}, },
{ type: 'adhoc', name: 'test', datasource: { uid: 'oogle' }, filters: [1] }, { type: 'adhoc', name: 'test', datasource: { uid: 'oogle' }, filters: [1] },
{ type: 'adhoc', name: 'test2', datasource: { uid: '$ds' }, filters: [2] }, { type: 'adhoc', name: 'test2', datasource: { uid: '$ds' }, filters: [2] },
@@ -209,6 +209,10 @@ describe('templateSrv', () => {
name: 'oogle', name: 'oogle',
uid: 'oogle', uid: 'oogle',
}), }),
logstash: mockDataSource({
name: 'logstash',
uid: 'logstash-id',
}),
}) })
); );
}); });
public/app/features/templating/template_srv.ts
+1 -1
View File
@@ -125,7 +125,7 @@ export class TemplateSrv implements BaseTemplateSrv {
if (variableUid === ds.uid) { if (variableUid === ds.uid) {
filters = filters.concat(variable.filters); filters = filters.concat(variable.filters);
} else if (variableUid?.indexOf('$') === 0) { } else if (variableUid?.indexOf('$') === 0) {
if (this.replace(variableUid) === datasourceName) { if (this.replace(variableUid) === ds.uid) {
filters = filters.concat(variable.filters); filters = filters.concat(variable.filters);
} }
} }