Skip to content

[Fleet] Install only OTel component template mappings for otelcol inputs #237165

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
merged 13 commits into from
Oct 9, 2025
+12 −35
Merged

[Fleet] Install only OTel component template mappings for otelcol inputs #237165

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a8077a8
Install only OTel component template mappings for otelcol inputs
jsoriano Oct 1, 2025
274bb27
[CI] Auto-commit changed files from 'node scripts/eslint_all_files --…
kibanamachine Oct 1, 2025
adc88be
Linting
jsoriano Oct 2, 2025
2802501
Merge branch 'main' into install-no-templates-otel
jsoriano Oct 6, 2025
3f6eed3
Linting
jsoriano Oct 6, 2025
a25948e
[CI] Auto-commit changed files from 'node scripts/lint_packages --fix'
kibanamachine Oct 6, 2025
5626cb8
Fix tests
jsoriano Oct 6, 2025
829dc1a
Remove override of subobjects
jsoriano Oct 6, 2025
2794e0a
Merge remote-tracking branch 'origin/main' into install-no-templates-…
jsoriano Oct 6, 2025
e1c2779
Merge remote-tracking branch 'jsoriano/install-no-templates-otel' int…
jsoriano Oct 6, 2025
21a42ae
Fix cypress test
jsoriano Oct 7, 2025
ae56246
Merge remote-tracking branch 'origin/main' into install-no-templates-…
jsoriano Oct 7, 2025
c7dc034
Merge branch 'main' into install-no-templates-otel
elasticmachine Oct 9, 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
2 changes: 1 addition & 1 deletion x-pack/platform/plugins/shared/fleet/cypress/e2e/input_packages_real.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ describe('OTel input package with custom data stream type', () => {
const agentPolicyId = 'test-otel-input-package-policy';
const agentPolicyName = 'Test input package policy';
const packagePolicyName = 'input-package-policy';
const datasetName = 'check'; // Default from the package.
const datasetName = 'httpcheckreceiver'; // Default from the package.
Copy link
Member Author

@jsoriano jsoriano Oct 7, 2025

Choose a reason for hiding this comment

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

About this change, see #237145 and elastic/elastic-package#2974.

const dataStreamType = 'logs';

before(() => {
Expand Down
Binary file modified x-pack/platform/plugins/shared/fleet/cypress/packages/otel_input_package-1.0.0.zip
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions x-pack/platform/plugins/shared/fleet/server/constants/fleet_es_assets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@ export const OTEL_LOGS_COMPONENT_TEMPLATES = [
OTEL_COMPONENT_SEMCONV_RESOURCE_TO_ECS_MAPPINGS,
];
export const OTEL_TRACES_COMPONENT_TEMPLATES = [
STACK_COMPONENT_TEMPLATE_TRACES_MAPPINGS,
STACK_COMPONENT_TEMPLATE_TRACES_SETTINGS,
OTEL_COMPONENT_TEMPLATE_MAPPINGS,
OTEL_COMPONENT_TEMPLATE_SETTINGS,
OTEL_COMPONENT_SEMCONV_RESOURCE_TO_ECS_MAPPINGS,
Expand Down
2 changes: 0 additions & 2 deletions .../platform/plugins/shared/fleet/server/services/epm/elasticsearch/template/install.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,6 @@ describe('EPM index template install', () => {
},
template: {
mappings: {
dynamic: true,
dynamic_templates: undefined,
properties: {
test_dimension: {
Expand Down Expand Up @@ -798,7 +797,6 @@ describe('EPM index template install', () => {
},
template: {
mappings: {
dynamic: true,
dynamic_templates: undefined,
properties: {
test_dimension: {
Expand Down
13 changes: 0 additions & 13 deletions x-pack/platform/plugins/shared/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 @@ -428,17 +428,6 @@ export function buildComponentTemplates(params: {
isSyntheticSourceEnabledByDefault ||
isTimeSeriesEnabledByDefault);

const isPkgConfiguringDynamicSettings =
Object.keys(mappingsRuntimeFields).length > 0 || indexTemplateMappings?.dynamic !== undefined;

// Setting overrides for otel input packages, but only if the packages don't explicitly disable dynamic mappings or use `dynamic: runtime`
// Override the `dynamic: false` set in otel@mappings to avoid conflicts in case
const shouldOverrideSettingsForOtelInputs = isOtelInputType && !isPkgConfiguringDynamicSettings;

// Override `subobjects: false` to avoid conflicts with traces-otel@mappings
const shouldOverrideSettingsForOtelInputsTraces =
shouldOverrideSettingsForOtelInputs && type === 'traces' && !indexTemplateMappings.runtime;
Copy link
Member Author

@jsoriano jsoriano Oct 7, 2025

Choose a reason for hiding this comment

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

These overrides can be avoided now that non-otel mappings are removed, and packages are not required to define fields.


templatesMap[packageTemplateName] = {
template: {
settings: {
Expand Down Expand Up @@ -472,8 +461,6 @@ export function buildComponentTemplates(params: {
: {}),
dynamic_templates: mappingsDynamicTemplates.length ? mappingsDynamicTemplates : undefined,
...omit(indexTemplateMappings, 'properties', 'dynamic_templates', 'runtime'),
...(shouldOverrideSettingsForOtelInputs ? { dynamic: true } : {}),
...(shouldOverrideSettingsForOtelInputsTraces ? { subobjects: undefined } : {}),
},
...(lifecycle ? { lifecycle } : {}),
},
Expand Down
13 changes: 0 additions & 13 deletions ...platform/plugins/shared/fleet/server/services/epm/elasticsearch/template/template.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ import {
OTEL_COMPONENT_TEMPLATE_TRACES_CUSTOM_MAPPINGS,
OTEL_COMPONENT_TEMPLATE_TRACES_MAPPINGS,
STACK_COMPONENT_TEMPLATE_LOGS_MAPPINGS,
STACK_COMPONENT_TEMPLATE_METRICS_SETTINGS,
STACK_COMPONENT_TEMPLATE_TRACES_MAPPINGS,
STACK_COMPONENT_TEMPLATE_TRACES_SETTINGS,
} from '../../../../constants/fleet_es_assets';

import { createAppContextStartContractMock } from '../../../../mocks';
Expand Down Expand Up @@ -342,14 +339,11 @@ describe('EPM template', () => {
});

expect(template.composed_of).toStrictEqual([
STACK_COMPONENT_TEMPLATE_LOGS_MAPPINGS,
STACK_COMPONENT_TEMPLATE_LOGS_SETTINGS,
OTEL_COMPONENT_TEMPLATE_MAPPINGS,
OTEL_COMPONENT_TEMPLATE_SETTINGS,
OTEL_COMPONENT_TEMPLATE_LOGS_MAPPINGS,
OTEL_COMPONENT_SEMCONV_RESOURCE_TO_ECS_MAPPINGS,
...composedOfTemplates,
STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
FLEET_AGENT_ID_VERIFY_COMPONENT_TEMPLATE_NAME,
]);
Expand All @@ -373,14 +367,11 @@ describe('EPM template', () => {
isOtelInputType: true,
});
expect(template.composed_of).toStrictEqual([
STACK_COMPONENT_TEMPLATE_METRICS_SETTINGS,
OTEL_COMPONENT_TEMPLATE_MAPPINGS,
OTEL_COMPONENT_TEMPLATE_SETTINGS,
OTEL_COMPONENT_TEMPLATE_METRICS_MAPPINGS,
OTEL_COMPONENT_SEMCONV_RESOURCE_TO_ECS_MAPPINGS,
...composedOfTemplates,

STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
FLEET_AGENT_ID_VERIFY_COMPONENT_TEMPLATE_NAME,
]);
Expand All @@ -404,15 +395,11 @@ describe('EPM template', () => {
isOtelInputType: true,
});
expect(template.composed_of).toStrictEqual([
STACK_COMPONENT_TEMPLATE_TRACES_MAPPINGS,
STACK_COMPONENT_TEMPLATE_TRACES_SETTINGS,
OTEL_COMPONENT_TEMPLATE_MAPPINGS,
OTEL_COMPONENT_TEMPLATE_SETTINGS,
OTEL_COMPONENT_SEMCONV_RESOURCE_TO_ECS_MAPPINGS,
OTEL_COMPONENT_TEMPLATE_TRACES_MAPPINGS,
...composedOfTemplates,

STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
FLEET_AGENT_ID_VERIFY_COMPONENT_TEMPLATE_NAME,
]);
Expand Down
15 changes: 11 additions & 4 deletions x-pack/platform/plugins/shared/fleet/server/services/epm/elasticsearch/template/template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,15 @@ export function getTemplate({
);
}

const esBaseComponents = getBaseEsComponents(type, !!isIndexModeTimeSeries);
const esBaseComponents = getBaseEsComponents(type, !!isIndexModeTimeSeries, isOtelInputType);

const isEventIngestedEnabled = (config?: FleetConfigType): boolean =>
Boolean(!config?.agentIdVerificationEnabled && config?.eventIngestedEnabled);

template.composed_of = [
...esBaseComponents,
...(isOtelInputType ? getOtelBaseComponents(type) : []),
...(template.composed_of || []),
STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
...(isOtelInputType ? [] : [STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS]),
FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
...(appContextService.getConfig()?.agentIdVerificationEnabled
? [FLEET_AGENT_ID_VERIFY_COMPONENT_TEMPLATE_NAME]
Expand All @@ -144,7 +143,15 @@ export function getTemplate({
return template;
}

const getBaseEsComponents = (type: string, isIndexModeTimeSeries: boolean): string[] => {
const getBaseEsComponents = (
type: string,
isIndexModeTimeSeries: boolean,
isOTelInputType?: boolean
): string[] => {
if (isOTelInputType) {
return getOtelBaseComponents(type);
}

if (type === 'metrics') {
if (isIndexModeTimeSeries) {
return [STACK_COMPONENT_TEMPLATE_METRICS_TSDB_SETTINGS];
Expand Down