Skip to content
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

[Fleet] Add the @custom pipeline only to the main datastream ingest pipeline #144150

Merged
merged 3 commits into from
Oct 31, 2022
Merged

[Fleet] Add the @custom pipeline only to the main datastream ingest pipeline #144150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbd4666
[Fleet] Add the @custom pipeline only to the main datastream ingest p…
nchaulet Oct 27, 2022
01e6b50
Merge branch 'main' into fix-custom-pipeline-only-main-pipelines
kibanamachine Oct 28, 2022
7fbfc76
Merge branch 'main' into fix-custom-pipeline-only-main-pipelines
kibanamachine Oct 31, 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
16 changes: 16 additions & 0 deletions x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ describe('Install pipeline tests', () => {
await res.install(esClient, logger);

expect(esClient.ingest.putPipeline).toBeCalled();

// It should add the @custom pipeline for the main pipeline
const pipelinesWithCustomProcessor = esClient.ingest.putPipeline.mock.calls.filter((call) =>
// @ts-ignore-error
call[0]?.body.includes('@custom')
);

expect(pipelinesWithCustomProcessor).toHaveLength(1);
});

it('should work with datastream with ingest pipelines define in the package', async () => {
Expand Down Expand Up @@ -73,6 +81,14 @@ describe('Install pipeline tests', () => {
await res.install(esClient, logger);

expect(esClient.ingest.putPipeline).toBeCalledTimes(2);

// It should add the @custom pipeline only for the main pipeline
const pipelinesWithCustomProcessor = esClient.ingest.putPipeline.mock.calls.filter((call) =>
// @ts-ignore-error
call[0]?.body.includes('@custom')
);

expect(pipelinesWithCustomProcessor).toHaveLength(1);
});
});
});
8 changes: 4 additions & 4 deletions x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ export async function installAllPipelines({
let datastreamPipelineCreated = false;
pipelinePaths.forEach((path) => {
const { name, extension } = getNameAndExtension(path);
if (name === dataStream?.ingest_pipeline) {
const isMainPipeline = name === dataStream?.ingest_pipeline;
if (isMainPipeline) {
datastreamPipelineCreated = true;
}
const nameForInstallation = getPipelineNameForInstallation({
Expand All @@ -168,9 +169,8 @@ export async function installAllPipelines({
const content = getAsset(path).toString('utf-8');
pipelinesInfos.push({
nameForInstallation,
customIngestPipelineNameForInstallation: dataStream
? getCustomPipelineNameForDatastream(dataStream)
: undefined,
customIngestPipelineNameForInstallation:
dataStream && isMainPipeline ? getCustomPipelineNameForDatastream(dataStream) : undefined,
content,
extension,
});
Expand Down