opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-22 02:52:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

elasticsearch: always use fixed_interval (#50297)

Browse Source
This commit is contained in:
Gábor Farkas
2022-06-13 10:28:29 +02:00
committed by GitHub
parent 0a815a7777
commit a2eb4e85e5
7 changed files with 15 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/elasticsearch/query_builder.ts
View File

@ -112,13 +112,7 @@ export class ElasticQueryBuilder {
const interval = settings.interval === 'auto' ? '$__interval' : settings.interval;
if (gte(this.esVersion, '8.0.0')) {
// The deprecation was actually introduced in 7.0.0, we might want to use that instead of the removal date,
// but it woudl be a breaking change on our side.
esAgg.fixed_interval = interval;
} else {
esAgg.interval = interval;
}
esAgg.fixed_interval = interval;
return esAgg;
}

11
public/app/plugins/datasource/elasticsearch/specs/query_builder.test.ts
View File

@ -763,16 +763,12 @@ describe('ElasticQueryBuilder', () => {
extended_bounds: { max: '$timeTo', min: '$timeFrom' },
field: '@timestamp',
format: 'epoch_millis',
interval: '$__interval',
fixed_interval: '$__interval',
min_doc_count: 0,
},
},
};
if (gte(builder.esVersion, '8.0.0')) {
expectedAggs['1'].date_histogram.fixed_interval = expectedAggs['1'].date_histogram.interval;
delete expectedAggs['1'].date_histogram.interval;
}
expect(query.aggs).toMatchObject(expectedAggs);
});
@ -959,7 +955,7 @@ describe('ElasticQueryBuilder', () => {
});
describe('interval parameter', () => {
it('should use interval if Elasticsearch version <8.0.0', () => {
it('should use fixed_interval', () => {
const query = builder77.build({
refId: 'A',
metrics: [{ type: 'count', id: '1' }],
@ -974,8 +970,7 @@ describe('ElasticQueryBuilder', () => {
],
});
expect(query.aggs['2'].date_histogram.interval).toBe('1d');
expect(query.aggs['2'].date_histogram.fixed_interval).toBeUndefined();
expect(query.aggs['2'].date_histogram.fixed_interval).toBe('1d');
});
});