Skip to content

[9.1] [Dataset Quality]Fix ES issue with index template updates (#231615) #232259

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
achyutjhunjhunwala merged 1 commit into from
Aug 19, 2025
Merged

[9.1] [Dataset Quality]Fix ES issue with index template updates (#231615) #232259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 37 additions & 10 deletions ...lutions/observability/test/dataset_quality_api_integration/tests/data_streams/es_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

import { Client } from '@elastic/elasticsearch';
import type { IndicesIndexTemplate } from '@elastic/elasticsearch/lib/api/types';

export async function addIntegrationToLogIndexTemplate({
esClient,
Expand All @@ -20,20 +21,33 @@ export async function addIntegrationToLogIndexTemplate({
name: 'logs',
});

// Remove properties from the GET response that cannot be in the PUT request
const {
created_date: createdDate,
modification_date: modificationDate,
created_date_millis: createdDateMillis,
modified_date_millis: modifiedDateMillis,
...safeTemplate
} = indexTemplates[0].index_template as IndicesIndexTemplate & {
created_date: number;
created_date_millis: number;
modification_date: number;
modified_date_millis: number;
};

await esClient.indices.putIndexTemplate({
name: 'logs',
...indexTemplates[0].index_template,
...safeTemplate,
_meta: {
...indexTemplates[0].index_template._meta,
...safeTemplate._meta,
package: {
name,
},
managed_by: managedBy,
},
// PUT expects string[] while GET might return string | string[]
ignore_missing_component_templates: indexTemplates[0].index_template
.ignore_missing_component_templates
? [indexTemplates[0].index_template.ignore_missing_component_templates].flat()
ignore_missing_component_templates: safeTemplate.ignore_missing_component_templates
? [safeTemplate.ignore_missing_component_templates].flat()
: undefined,
});
}
Expand All @@ -43,18 +57,31 @@ export async function cleanLogIndexTemplate({ esClient }: { esClient: Client })
name: 'logs',
});

// Remove properties from the GET response that cannot be in the PUT request
const {
created_date: createdDate,
modification_date: modificationDate,
created_date_millis: createdDateMillis,
modified_date_millis: modifiedDateMillis,
...safeTemplate
} = indexTemplates[0].index_template as IndicesIndexTemplate & {
created_date: number;
created_date_millis: number;
modification_date: number;
modified_date_millis: number;
};

await esClient.indices.putIndexTemplate({
name: 'logs',
...indexTemplates[0].index_template,
...safeTemplate,
_meta: {
...indexTemplates[0].index_template._meta,
...safeTemplate._meta,
package: undefined,
managed_by: undefined,
},
// PUT expects string[] while GET might return string | string[]
ignore_missing_component_templates: indexTemplates[0].index_template
.ignore_missing_component_templates
? [indexTemplates[0].index_template.ignore_missing_component_templates].flat()
ignore_missing_component_templates: safeTemplate.ignore_missing_component_templates
? [safeTemplate.ignore_missing_component_templates].flat()
: undefined,
});
}