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:
@@ -38,7 +38,7 @@ describe('ConfigEditor', () => {
|
|||||||
expect(mockOnOptionsChange).toHaveBeenCalledWith(
|
expect(mockOnOptionsChange).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
jsonData: expect.objectContaining({
|
jsonData: expect.objectContaining({
|
||||||
esVersion: '5.0.0',
|
esVersion: '8.0.0',
|
||||||
timeField: '@timestamp',
|
timeField: '@timestamp',
|
||||||
maxConcurrentShardRequests: 5,
|
maxConcurrentShardRequests: 5,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ describe('removeEmpty', () => {
|
|||||||
expect(coerceESVersion('8.1.3')).toBe('8.1.3');
|
expect(coerceESVersion('8.1.3')).toBe('8.1.3');
|
||||||
|
|
||||||
// invalid string
|
// invalid string
|
||||||
expect(coerceESVersion('haha')).toBe('5.0.0');
|
expect(coerceESVersion('haha')).toBe('8.0.0');
|
||||||
|
|
||||||
// known number
|
// known number
|
||||||
expect(coerceESVersion(2)).toBe('2.0.0');
|
expect(coerceESVersion(2)).toBe('2.0.0');
|
||||||
@@ -47,11 +47,12 @@ describe('removeEmpty', () => {
|
|||||||
expect(coerceESVersion(56)).toBe('5.6.0');
|
expect(coerceESVersion(56)).toBe('5.6.0');
|
||||||
expect(coerceESVersion(60)).toBe('6.0.0');
|
expect(coerceESVersion(60)).toBe('6.0.0');
|
||||||
expect(coerceESVersion(70)).toBe('7.0.0');
|
expect(coerceESVersion(70)).toBe('7.0.0');
|
||||||
|
expect(coerceESVersion(8)).toBe('8.0.0');
|
||||||
|
|
||||||
// unknown number
|
// unknown number
|
||||||
expect(coerceESVersion(42)).toBe('5.0.0');
|
expect(coerceESVersion(42)).toBe('8.0.0');
|
||||||
|
|
||||||
// undefined
|
// undefined
|
||||||
expect(coerceESVersion(undefined)).toBe('5.0.0');
|
expect(coerceESVersion(undefined)).toBe('8.0.0');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -101,21 +101,22 @@ export const getScriptValue = (metric: MetricAggregationWithInlineScript) =>
|
|||||||
*/
|
*/
|
||||||
export const coerceESVersion = (version: string | number | undefined): string => {
|
export const coerceESVersion = (version: string | number | undefined): string => {
|
||||||
if (typeof version === 'string') {
|
if (typeof version === 'string') {
|
||||||
return valid(version) || '5.0.0';
|
return valid(version) || '8.0.0';
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (version) {
|
switch (version) {
|
||||||
case 2:
|
case 2:
|
||||||
return '2.0.0';
|
return '2.0.0';
|
||||||
|
case 5:
|
||||||
|
return '5.0.0';
|
||||||
case 56:
|
case 56:
|
||||||
return '5.6.0';
|
return '5.6.0';
|
||||||
case 60:
|
case 60:
|
||||||
return '6.0.0';
|
return '6.0.0';
|
||||||
case 70:
|
case 70:
|
||||||
return '7.0.0';
|
return '7.0.0';
|
||||||
case 5:
|
|
||||||
default:
|
default:
|
||||||
return '5.0.0';
|
return '8.0.0';
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user