renaming

elastic · Jan 30, 2024 · 798bcd9 · 798bcd9
1 parent 550bafc
commit 798bcd9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/x-pack/plugins/fleet/server/constants/fleet_es_assets.ts b/x-pack/plugins/fleet/server/constants/fleet_es_assets.ts
@@ -17,8 +17,6 @@ export const FLEET_AGENT_POLICIES_SCHEMA_VERSION = '1.1.1';
 
 export const FLEET_FINAL_PIPELINE_ID = '.fleet_final_pipeline-1';
 
-export const FLEET_ECS_MAPPINGS_COMPONENT_TEMPLATE_NAME = 'ecs@mappings';
-
 export const FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME = '.fleet_globals-1';
 
 export const FLEET_GLOBALS_COMPONENT_TEMPLATE_CONTENT = {
@@ -86,6 +84,7 @@ export const FLEET_COMPONENT_TEMPLATES = [
 export const STACK_COMPONENT_TEMPLATE_LOGS_SETTINGS = `logs@settings`;
 export const STACK_COMPONENT_TEMPLATE_METRICS_SETTINGS = `metrics@settings`;
 export const STACK_COMPONENT_TEMPLATE_METRICS_TSDB_SETTINGS = `metrics@tsdb-settings`;
+export const STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS = 'ecs@mappings';
 
 export const STACK_COMPONENT_TEMPLATES = [
   STACK_COMPONENT_TEMPLATE_LOGS_SETTINGS,

diff --git a/x-pack/plugins/fleet/server/constants/index.ts b/x-pack/plugins/fleet/server/constants/index.ts
@@ -88,7 +88,7 @@ export {
 } from '../../common/constants';
 
 export {
-  FLEET_ECS_MAPPINGS_COMPONENT_TEMPLATE_NAME,
+  STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
   FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
   FLEET_GLOBALS_COMPONENT_TEMPLATE_CONTENT,
   FLEET_AGENT_ID_VERIFY_COMPONENT_TEMPLATE_NAME,

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
@@ -21,7 +21,7 @@ import { processFields } from '../../fields/field';
 import type { Field } from '../../fields/field';
 import {
   FLEET_COMPONENT_TEMPLATES,
-  FLEET_ECS_MAPPINGS_COMPONENT_TEMPLATE_NAME,
+  STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
   FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
 } from '../../../../constants';
 
@@ -83,7 +83,7 @@ describe('EPM template', () => {
     expect(template.composed_of).toStrictEqual([
       'logs@settings',
       ...composedOfTemplates,
-      FLEET_ECS_MAPPINGS_COMPONENT_TEMPLATE_NAME,
+      STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
       ...FLEET_COMPONENT_TEMPLATES_NAMES,
     ]);
   });
@@ -103,7 +103,7 @@ describe('EPM template', () => {
     expect(template.composed_of).toStrictEqual([
       'metrics@tsdb-settings',
       ...composedOfTemplates,
-      FLEET_ECS_MAPPINGS_COMPONENT_TEMPLATE_NAME,
+      STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
       ...FLEET_COMPONENT_TEMPLATES_NAMES,
     ]);
   });
@@ -128,7 +128,7 @@ describe('EPM template', () => {
     expect(template.composed_of).toStrictEqual([
       'logs@settings',
       ...composedOfTemplates,
-      FLEET_ECS_MAPPINGS_COMPONENT_TEMPLATE_NAME,
+      STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
       FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
     ]);
   });
@@ -147,7 +147,7 @@ describe('EPM template', () => {
     });
     expect(template.composed_of).toStrictEqual([
       'logs@settings',
-      FLEET_ECS_MAPPINGS_COMPONENT_TEMPLATE_NAME,
+      STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
       ...FLEET_COMPONENT_TEMPLATES_NAMES,
     ]);
   });

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
@@ -25,7 +25,7 @@ import type {
 import { appContextService } from '../../..';
 import { getRegistryDataStreamAssetBaseName } from '../../../../../common/services';
 import {
-  FLEET_ECS_MAPPINGS_COMPONENT_TEMPLATE_NAME,
+  STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
   FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
   FLEET_AGENT_ID_VERIFY_COMPONENT_TEMPLATE_NAME,
   STACK_COMPONENT_TEMPLATE_LOGS_SETTINGS,
@@ -114,7 +114,7 @@ export function getTemplate({
   template.composed_of = [
     ...esBaseComponents,
     ...(template.composed_of || []),
-    FLEET_ECS_MAPPINGS_COMPONENT_TEMPLATE_NAME,
+    STACK_COMPONENT_TEMPLATE_ECS_MAPPINGS,
     FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
     ...(appContextService.getConfig()?.agentIdVerificationEnabled
       ? [FLEET_AGENT_ID_VERIFY_COMPONENT_TEMPLATE_NAME]