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

Elasticsearch: interpolate variables in Filters Bucket Aggregation (#28969)

Browse Source
This commit is contained in:
Giordano Ricci
2020-11-11 12:56:43 +00:00
committed by GitHub
parent 46d568129e
commit d99c553a71
2 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
public/app/plugins/datasource/elasticsearch/datasource.test.ts
View File

@@ -864,6 +864,34 @@ describe('ElasticDatasource', function(this: any) {
expect(typeof JSON.parse(query.split('\n')[1]).query.bool.filter[0].range['@time'].gte).toBe('number');
});
});
it('should correctly interpolate variables in query', () => {
const query = {
alias: '',
bucketAggs: [{ type: 'filters', settings: { filters: [{ query: '$var', label: '' }] }, id: '1' }],
metrics: [{ type: 'count', id: '1' }],
query: '$var',
};
const interpolatedQuery = ctx.ds.interpolateVariablesInQueries([query], {})[0];
expect(interpolatedQuery.query).toBe('resolvedVariable');
expect(interpolatedQuery.bucketAggs[0].settings.filters[0].query).toBe('resolvedVariable');
});
it('should correctly handle empty query strings', () => {
const query = {
alias: '',
bucketAggs: [{ type: 'filters', settings: { filters: [{ query: '', label: '' }] }, id: '1' }],
metrics: [{ type: 'count', id: '1' }],
query: '',
};
const interpolatedQuery = ctx.ds.interpolateVariablesInQueries([query], {})[0];
expect(interpolatedQuery.query).toBe('*');
expect(interpolatedQuery.bucketAggs[0].settings.filters[0].query).toBe('*');
});
});
describe('enhanceDataFrame', () => {