github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] Use index.mapping.source.mode instead of _source.mode (#202729)

Browse source
This commit is contained in:
Nicolas Chaulet 2024-12-03 12:49:49 -05:00 • committed by GitHub
parent 55a0df9c5e
commit 6e5fc696a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

28
x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts
View file

@ -124,12 +124,13 @@ describe('EPM index template install', () => {
const packageTemplate = componentTemplates['metrics-package.dataset@package'].template;
if (!('mappings' in packageTemplate)) {
if (!('settings' in packageTemplate)) {
throw new Error('no mappings on package template');
}
expect(packageTemplate.mappings).toHaveProperty('_source');
expect(packageTemplate.mappings._source).toEqual({ mode: 'synthetic' });
expect(packageTemplate.settings?.index?.mapping).toHaveProperty('source');
// @ts-expect-error esclient mapping out-of-date
expect(packageTemplate.settings?.index?.mapping?.source).toEqual({ mode: 'synthetic' });
});
it('tests prepareTemplate to set source mode to synthetics if index_mode:time_series', async () => {
@ -154,12 +155,13 @@ describe('EPM index template install', () => {
const packageTemplate = componentTemplates['metrics-package.dataset@package'].template;
if (!('mappings' in packageTemplate)) {
throw new Error('no mappings on package template');
if (!('settings' in packageTemplate)) {
throw new Error('no settings on package template');
}
expect(packageTemplate.mappings).toHaveProperty('_source');
expect(packageTemplate.mappings._source).toEqual({ mode: 'synthetic' });
expect(packageTemplate.settings?.index?.mapping).toHaveProperty('source');
// @ts-expect-error esclient mapping out-of-date
expect(packageTemplate.settings?.index?.mapping?.source).toEqual({ mode: 'synthetic' });
});
it('tests prepareTemplate to not set source mode to synthetics if index_mode:time_series and user disabled synthetic', async () => {
@ -193,11 +195,11 @@ describe('EPM index template install', () => {
const packageTemplate = componentTemplates['metrics-package.dataset@package'].template;
if (!('mappings' in packageTemplate)) {
throw new Error('no mappings on package template');
if (!('settings' in packageTemplate)) {
throw new Error('no settings on package template');
}
expect(packageTemplate.mappings).not.toHaveProperty('_source');
expect(packageTemplate.settings?.index?.mapping).not.toHaveProperty('source');
});
it('tests prepareTemplate to not set source mode to synthetics if specified but user disabled it', async () => {
@ -231,11 +233,11 @@ describe('EPM index template install', () => {
const packageTemplate = componentTemplates['metrics-package.dataset@package'].template;
if (!('mappings' in packageTemplate)) {
throw new Error('no mappings on package template');
if (!('settings' in packageTemplate)) {
throw new Error('no settings on package template');
}
expect(packageTemplate.mappings).not.toHaveProperty('_source');
expect(packageTemplate.settings?.index?.mapping).not.toHaveProperty('source');
});
it('tests prepareTemplate to set index_mode time series if index_mode:time_series', async () => {

18
x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
View file

@ -409,6 +409,14 @@ export function buildComponentTemplates(params: {
templateSettings.index?.mapping?.total_fields?.limit
),
},
...(templateSettings.index?.mapping?.source || sourceModeSynthetic
? {
source: {
...templateSettings.index?.mapping?.source,
...(sourceModeSynthetic ? { mode: 'synthetic' } : {}),
},
}
: {}),
},
},
},
@ -418,15 +426,7 @@ export function buildComponentTemplates(params: {
? { runtime: mappingsRuntimeFields }
: {}),
dynamic_templates: mappingsDynamicTemplates.length ? mappingsDynamicTemplates : undefined,
...omit(indexTemplateMappings, 'properties', 'dynamic_templates', '_source', 'runtime'),
...(indexTemplateMappings?._source || sourceModeSynthetic
? {
_source: {
...indexTemplateMappings?._source,
...(sourceModeSynthetic ? { mode: 'synthetic' } : {}),
},
}
: {}),
...omit(indexTemplateMappings, 'properties', 'dynamic_templates', 'runtime'),
},
...(lifecycle ? { lifecycle } : {}),
},

6
x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
View file

@ -1031,8 +1031,8 @@ const updateExistingDataStream = async ({
const existingDsConfig = Object.values(existingDs);
const currentBackingIndexConfig = existingDsConfig.at(-1);
const currentIndexMode = currentBackingIndexConfig?.settings?.index?.mode;
// @ts-expect-error Property 'mode' does not exist on type 'MappingSourceField'
const currentSourceType = currentBackingIndexConfig.mappings?._source?.mode;
// @ts-expect-error Property 'source.mode' does not exist on type 'IndicesMappingLimitSettings'
const currentSourceType = currentBackingIndexConfig?.settings?.index?.mapping?.source?.mode;
let settings: IndicesIndexSettings;
let mappings: MappingTypeMapping = {};
@ -1141,7 +1141,7 @@ const updateExistingDataStream = async ({
// Trigger a rollover if the index mode or source type has changed
if (
currentIndexMode !== settings?.index?.mode ||
currentSourceType !== mappings?._source?.mode ||
currentSourceType !== settings?.index?.source?.mode ||
dynamicDimensionMappingsChanged
) {
if (options?.skipDataStreamRollover === true) {