Use .integration instead of .package for suffix

elastic · Jan 24, 2024 · f878ae9 · f878ae9
1 parent 4e5acad
commit f878ae9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/helpers.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/helpers.ts
@@ -100,8 +100,8 @@ export function addCustomPipelineAndLocalRoutingRulesProcessor(
       ? [
           {
             pipeline: {
-              // This pipeline name gets the `.package` suffix to avoid conflicts with the pipeline name for the dataset below
-              name: `${pipeline.dataStream.type}-${pipeline.dataStream.package}.package@custom`,
+              // This pipeline name gets the `.integration` suffix to avoid conflicts with the pipeline name for the dataset below
+              name: `${pipeline.dataStream.type}-${pipeline.dataStream.package}.integration@custom`,
               ignore_missing_pipeline: true,
               description: `[Fleet] Pipeline for all data streams of type \`${pipeline.dataStream.type}\` defined by the \`${pipeline.dataStream.package}\` integration`,
             },

diff --git a/x-pack/test/fleet_api_integration/apis/epm/custom_ingest_pipeline.ts b/x-pack/test/fleet_api_integration/apis/epm/custom_ingest_pipeline.ts
@@ -105,12 +105,12 @@ export default function (providerContext: FtrProviderContext) {
         });
 
         await es.ingest.putPipeline({
-          id: `logs-log.package@custom`,
+          id: `logs-log.integration@custom`,
           processors: [
             {
               append: {
                 field: 'test',
-                value: ['logs-log.package'],
+                value: ['logs-log.integration'],
               },
             },
           ],
@@ -138,7 +138,7 @@ export default function (providerContext: FtrProviderContext) {
             id: 'logs@custom',
           }),
           es.ingest.deletePipeline({
-            id: 'logs-log.package@custom',
+            id: 'logs-log.integration@custom',
           }),
           es.ingest.deletePipeline({
             id: CUSTOM_PIPELINE,
@@ -158,7 +158,12 @@ export default function (providerContext: FtrProviderContext) {
           id: res._id,
           index: res._index,
         });
-        expect(doc._source?.test).be.eql(['global', 'logs', 'logs-log.package', 'logs-log.log']);
+        expect(doc._source?.test).be.eql([
+          'global',
+          'logs',
+          'logs-log.integration',
+          'logs-log.log',
+        ]);
       });
     });
   });