Skip to content

[Fleet] Merge settings & mappings component template in @package #128498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nchaulet merged 7 commits into from
Mar 29, 2022
Merged

[Fleet] Merge settings & mappings component template in @package #128498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b971d8
[Fleet] Merge settings & mappings
nchaulet Mar 24, 2022
bad31b4
Fix tests
nchaulet Mar 24, 2022
bd8a559
Fix unused import
nchaulet Mar 24, 2022
afcecf4
Merge branch 'main' of github.com:elastic/kibana into feature-merge-s…
nchaulet Mar 24, 2022
4873aed
Fix tests
nchaulet Mar 24, 2022
fe282e7
Merge branch 'main' into feature-merge-settings-mappings
kibanamachine Mar 24, 2022
8bad83e
Merge branch 'main' into feature-merge-settings-mappings
kibanamachine Mar 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions x-pack/plugins/fleet/server/constants/fleet_es_assets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
import { getESAssetMetadata } from '../services/epm/elasticsearch/meta';

const meta = getESAssetMetadata();
export const MAPPINGS_TEMPLATE_SUFFIX = '@mappings';

export const SETTINGS_TEMPLATE_SUFFIX = '@settings';
export const PACKAGE_TEMPLATE_SUFFIX = '@package';

export const USER_SETTINGS_TEMPLATE_SUFFIX = '@custom';

Expand Down
3 changes: 1 addition & 2 deletions x-pack/plugins/fleet/server/constants/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ export {
FLEET_FINAL_PIPELINE_ID,
FLEET_FINAL_PIPELINE_CONTENT,
FLEET_FINAL_PIPELINE_VERSION,
MAPPINGS_TEMPLATE_SUFFIX,
SETTINGS_TEMPLATE_SUFFIX,
USER_SETTINGS_TEMPLATE_SUFFIX,
PACKAGE_TEMPLATE_SUFFIX,
} from './fleet_es_assets';
34 changes: 10 additions & 24 deletions x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { merge, cloneDeep } from 'lodash';
import { merge } from 'lodash';
import Boom from '@hapi/boom';
import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'src/core/server';

Expand All @@ -29,8 +29,7 @@ import { getAsset, getPathParts } from '../../archive';
import { removeAssetTypesFromInstalledEs, saveInstalledEsRefs } from '../../packages/install';
import {
FLEET_COMPONENT_TEMPLATES,
MAPPINGS_TEMPLATE_SUFFIX,
SETTINGS_TEMPLATE_SUFFIX,
PACKAGE_TEMPLATE_SUFFIX,
USER_SETTINGS_TEMPLATE_SUFFIX,
} from '../../../../constants';

Expand Down Expand Up @@ -245,34 +244,28 @@ function buildComponentTemplates(params: {
defaultSettings: IndexTemplate['template']['settings'];
}) {
const { templateName, registryElasticsearch, packageName, defaultSettings, mappings } = params;
const mappingsTemplateName = `${templateName}${MAPPINGS_TEMPLATE_SUFFIX}`;
const settingsTemplateName = `${templateName}${SETTINGS_TEMPLATE_SUFFIX}`;
const packageTemplateName = `${templateName}${PACKAGE_TEMPLATE_SUFFIX}`;
const userSettingsTemplateName = `${templateName}${USER_SETTINGS_TEMPLATE_SUFFIX}`;

const templatesMap: TemplateMap = {};
const _meta = getESAssetMetadata({ packageName });

const indexTemplateSettings = registryElasticsearch?.['index_template.settings'] ?? {};
// @ts-expect-error no property .mapping (yes there is)
const indexTemplateMappingSettings = indexTemplateSettings?.index?.mapping;
const indexTemplateSettingsForTemplate = cloneDeep(indexTemplateSettings);

// index.mapping settings must go on the mapping component template otherwise
// the template may be rejected e.g if nested_fields.limit has been increased
if (indexTemplateMappingSettings) {
// @ts-expect-error no property .mapping
delete indexTemplateSettingsForTemplate.index.mapping;
}

templatesMap[mappingsTemplateName] = {
const templateSettings = merge(defaultSettings, indexTemplateSettings);

templatesMap[packageTemplateName] = {
template: {
settings: {
...templateSettings,
index: {
...templateSettings.index,
mapping: {
...templateSettings?.mapping,
total_fields: {
...templateSettings?.mapping?.total_fields,
limit: '10000',
},
...indexTemplateMappingSettings,
},
},
},
Expand All @@ -281,13 +274,6 @@ function buildComponentTemplates(params: {
_meta,
};

templatesMap[settingsTemplateName] = {
template: {
settings: merge(defaultSettings, indexTemplateSettingsForTemplate),
},
_meta,
};

// return empty/stub template
templatesMap[userSettingsTemplateName] = {
template: {
Expand Down
Loading