root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 243 Packages Projects Releases Wiki Activity

fix(elasticsearch): remove deprecated elastic versions (#54632) 

* fix(elasticsearch): remove deprecated elastic versions

* fix(elasticsearch): make 8 the default and fallback version
This commit is contained in:
Matias Chomicki 2022-09-06 15:42:39 +02:00 committed by GitHub
parent 7a01186324
commit baffc3d948
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx
View File

@ -38,7 +38,7 @@ describe('ConfigEditor', () => {
expect(mockOnOptionsChange).toHaveBeenCalledWith(
expect.objectContaining({
jsonData: expect.objectContaining({
esVersion: '5.0.0',
esVersion: '8.0.0',
timeField: '@timestamp',
maxConcurrentShardRequests: 5,
}),

7
public/app/plugins/datasource/elasticsearch/utils.test.ts
View File

@ -39,7 +39,7 @@ describe('removeEmpty', () => {
expect(coerceESVersion('8.1.3')).toBe('8.1.3');
// invalid string
expect(coerceESVersion('haha')).toBe('5.0.0');
expect(coerceESVersion('haha')).toBe('8.0.0');
// known number
expect(coerceESVersion(2)).toBe('2.0.0');
@ -47,11 +47,12 @@ describe('removeEmpty', () => {
expect(coerceESVersion(56)).toBe('5.6.0');
expect(coerceESVersion(60)).toBe('6.0.0');
expect(coerceESVersion(70)).toBe('7.0.0');
expect(coerceESVersion(8)).toBe('8.0.0');
// unknown number
expect(coerceESVersion(42)).toBe('5.0.0');
expect(coerceESVersion(42)).toBe('8.0.0');
// undefined
expect(coerceESVersion(undefined)).toBe('5.0.0');
expect(coerceESVersion(undefined)).toBe('8.0.0');
});
});

7
public/app/plugins/datasource/elasticsearch/utils.ts
View File

@ -101,21 +101,22 @@ export const getScriptValue = (metric: MetricAggregationWithInlineScript) =>
*/
export const coerceESVersion = (version: string | number | undefined): string => {
if (typeof version === 'string') {
return valid(version) || '5.0.0';
return valid(version) || '8.0.0';
}
switch (version) {
case 2:
return '2.0.0';
case 5:
return '5.0.0';
case 56:
return '5.6.0';
case 60:
return '6.0.0';
case 70:
return '7.0.0';
case 5:
default:
return '5.0.0';
return '8.0.0';
}
};