Skip to content

Fix ignored dynamic templates #219875

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
ersin-erdal merged 6 commits into from
May 2, 2025
Merged

Fix ignored dynamic templates #219875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56a7587
Fix ignored dynamic templates
ersin-erdal May 1, 2025
a3e4589
add a unit test
ersin-erdal May 1, 2025
9a6472b
Merge branch 'main' into fix-ignored-dynamic-templates
ersin-erdal May 1, 2025
0701174
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine May 1, 2025
d834a77
fix type check
ersin-erdal May 1, 2025
744fb89
Merge branch 'fix-ignored-dynamic-templates' of github.com:ersin-erda…
ersin-erdal May 1, 2025
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
30 changes: 30 additions & 0 deletions x-pack/platform/plugins/shared/alerting/server/alerts_service/alerts_service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,36 @@ describe('Alerts Service', () => {
}
});

test('should save the dynamic_templates', async () => {
const dynamicTemplates = [
{
strings_as_keywords: {
path_match: 'test-path',
match_mapping_type: 'string',
mapping: {
type: 'keyword',
ignore_above: 1024,
},
},
},
] satisfies IRuleTypeAlerts['mappings']['dynamicTemplates'];

alertsService.register({
...TestRegistrationContext,
mappings: {
...TestRegistrationContext.mappings,
dynamicTemplates,
},
});
await retryUntil(
'context initialized',
async () => (await getContextInitialized(alertsService)) === true
);

const componentTemplate = clusterClient.cluster.putComponentTemplate.mock.calls[3][0];
expect(componentTemplate.template.mappings?.dynamic_templates).toEqual(dynamicTemplates);
});

test('should correctly install resources for custom namespace on demand when isSpaceAware is true', async () => {
alertsService.register({ ...TestRegistrationContext, isSpaceAware: true });
await retryUntil(
Expand Down
1 change: 1 addition & 0 deletions x-pack/platform/plugins/shared/alerting/server/alerts_service/alerts_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ export class AlertsService implements IAlertsService {
const componentTemplate = getComponentTemplate({
fieldMap: mappings.fieldMap,
dynamic: mappings.dynamic,
dynamicTemplates: mappings.dynamicTemplates,
Copy link
Copy Markdown
Contributor

@ymao1 ymao1 May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i would add a unit test to the getComponent template function to verify this is passed through

Copy link
Copy Markdown
Contributor Author

@ersin-erdal ersin-erdal May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added a unit test

context,
});
initFns.push(
Expand Down
4 changes: 2 additions & 2 deletions ...tion/spaces_only/tests/alerting/group4/alerts_as_data/alerts_as_data_dynamic_templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default function createAlertsAsDataDynamicTemplatesTest({ getService }: F
// therefore we add 9 to get the real number.
const nestedObjectsAndMultiFields = 9;
// Number of free slots that we want to have, so we can add dynamic fields as many
const numberofFreeSlots = 3;
const numberofFreeSlots = 2;
const totalFields =
numberOfExistingFields + nestedObjectsAndMultiFields + numberofFreeSlots;

Expand Down Expand Up @@ -128,7 +128,7 @@ export default function createAlertsAsDataDynamicTemplatesTest({ getService }: F
);

// new dynamic field has been added
expect(dynamicField).to.eql('text');
expect(dynamicField).to.eql('keyword');
});
});

Expand Down