Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
6beb515
Auto increase fields limit of the alert indices
ersin-erdal Apr 1, 2025
a61adb4
add dynamic templates
ersin-erdal Apr 2, 2025
e4f6a04
refactor
ersin-erdal Apr 2, 2025
81d159b
fix tests
ersin-erdal Apr 2, 2025
1cbf0ff
fix unit test
ersin-erdal Apr 3, 2025
171b572
add fuctional test
ersin-erdal Apr 4, 2025
4da5e1c
fix redundant const
ersin-erdal Apr 4, 2025
c510d1c
fix tests
ersin-erdal Apr 4, 2025
62945da
find index by wildcard
ersin-erdal Apr 4, 2025
47718b1
add timeout
ersin-erdal Apr 4, 2025
9ff866f
index name
ersin-erdal Apr 5, 2025
077156c
update before changing mappings
ersin-erdal Apr 5, 2025
727c541
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Apr 5, 2025
e9b8aee
fix linter
ersin-erdal Apr 5, 2025
31ee906
Merge branch '283-auto-increase-fields-limit' of github.com:ersin-erd…
ersin-erdal Apr 5, 2025
4e431b2
linter
ersin-erdal Apr 5, 2025
1dcdcbf
Merge branch 'main' into 283-auto-increase-fields-limit
ersin-erdal Apr 5, 2025
c0d84be
prevent flak test
ersin-erdal Apr 5, 2025
dbd32df
Merge branch '283-auto-increase-fields-limit' of github.com:ersin-erd…
ersin-erdal Apr 5, 2025
77830ba
Merge branch 'main' into 283-auto-increase-fields-limit
ersin-erdal Apr 9, 2025
2abb225
fix typos and add preventive checks
ersin-erdal Apr 9, 2025
700828f
test exceeded limit error message
ersin-erdal Apr 9, 2025
67b6150
fix linter
ersin-erdal Apr 9, 2025
7a2bd2b
Merge branch 'main' into 283-auto-increase-fields-limit
ersin-erdal Apr 10, 2025
372236c
add ".ignore_dynamic_beyond_limit" during update as well
ersin-erdal Apr 11, 2025
0dad645
Merge branch '283-auto-increase-fields-limit' of github.com:ersin-erd…
ersin-erdal Apr 11, 2025
5e0f24c
Merge branch 'main' into 283-auto-increase-fields-limit
ersin-erdal Apr 11, 2025
b26fc57
fix updateIndexTemplateFieldsLimit
ersin-erdal Apr 11, 2025
6c7b45a
Merge branch 'main' into 283-auto-increase-fields-limit
ersin-erdal Apr 14, 2025
0a7d3c4
update `ignore_dynamic_beyond_limit` while updating the limit
ersin-erdal Apr 14, 2025
ccc282e
Merge branch '283-auto-increase-fields-limit' of github.com:ersin-erd…
ersin-erdal Apr 14, 2025
90e5c4c
add unit test for the flattened template names and add a debug log
ersin-erdal Apr 15, 2025
11f374b
add number of attempts
ersin-erdal Apr 15, 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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
* 2.0.
*/

import type { ClusterPutComponentTemplateRequest } from '@elastic/elasticsearch/lib/api/types';
import type {
ClusterPutComponentTemplateRequest,
MappingDynamicTemplate,
} from '@elastic/elasticsearch/lib/api/types';
import { type FieldMap } from '@kbn/alerts-as-data-utils';
import { mappingFromFieldMap } from './mapping_from_field_map';

Expand All @@ -14,12 +17,14 @@ export interface GetComponentTemplateFromFieldMapOpts {
fieldMap: FieldMap;
includeSettings?: boolean;
dynamic?: 'strict' | false;
dynamicTemplates?: Array<Record<string, MappingDynamicTemplate>>;
}
export const getComponentTemplateFromFieldMap = ({
name,
fieldMap,
dynamic,
includeSettings,
dynamicTemplates,
}: GetComponentTemplateFromFieldMapOpts): ClusterPutComponentTemplateRequest => {
return {
name,
Expand All @@ -37,7 +42,10 @@ export const getComponentTemplateFromFieldMap = ({
: {}),
},

mappings: mappingFromFieldMap(fieldMap, dynamic ?? 'strict'),
mappings: {
...mappingFromFieldMap(fieldMap, dynamic ?? 'strict'),
...(dynamicTemplates ? { dynamic_templates: dynamicTemplates } : {}),
},
},
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ const getIndexTemplatePutBody = (opts?: GetIndexTemplatePutBodyOpts) => {
}),
'index.mapping.ignore_malformed': true,
'index.mapping.total_fields.limit': 2500,
'index.mapping.total_fields.ignore_dynamic_beyond_limit': true,
},
mappings: {
dynamic: false,
Expand Down Expand Up @@ -479,6 +480,7 @@ describe('Alerts Service', () => {
settings: {
...existingIndexTemplate.index_template.template?.settings,
'index.mapping.total_fields.limit': 2500,
'index.mapping.total_fields.ignore_dynamic_beyond_limit': true,
},
},
});
Expand Down Expand Up @@ -899,6 +901,7 @@ describe('Alerts Service', () => {
},
}),
'index.mapping.ignore_malformed': true,
'index.mapping.total_fields.ignore_dynamic_beyond_limit': true,
'index.mapping.total_fields.limit': 2500,
},
mappings: {
Expand Down
Loading