[Fleet] Fix agent policy mappings for space awareness (elastic#201689)

(cherry picked from commit 721b4be)
kibanamachine · Nov 28, 2024 · 83f08d8 · 83f08d8
1 parent d45b628
commit 83f08d8
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 2 deletions.
diff --git a/packages/kbn-check-mappings-update-cli/current_mappings.json b/packages/kbn-check-mappings-update-cli/current_mappings.json
@@ -1593,6 +1593,7 @@
     }
   },
   "fleet-agent-policies": {
+    "dynamic": false,
     "properties": {
       "advanced_settings": {
         "index": false,
@@ -1962,6 +1963,7 @@
     "properties": {}
   },
   "ingest-agent-policies": {
+    "dynamic": false,
     "properties": {
       "advanced_settings": {
         "index": false,

diff --git a/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts b/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
@@ -105,7 +105,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "file": "6b65ae5899b60ebe08656fd163ea532e557d3c98",
         "file-upload-usage-collection-telemetry": "06e0a8c04f991e744e09d03ab2bd7f86b2088200",
         "fileShare": "5be52de1747d249a221b5241af2838264e19aaa1",
-        "fleet-agent-policies": "f57d3b70e4175a19a18f18ee72a379ceec82e1fc",
+        "fleet-agent-policies": "908765a33aab066f4ac09446686b2d884aceed00",
         "fleet-fleet-server-host": "69be15f6b6f2a2875ad3c7050ddea7a87f505417",
         "fleet-message-signing-keys": "93421f43fed2526b59092a4e3c65d64bc2266c0f",
         "fleet-package-policies": "0206c20f27286787b91814a2e7872f06dc1e8e47",
@@ -121,7 +121,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "infra-custom-dashboards": "1a5994f2e05bb8a1609825ddbf5012f77c5c67f3",
         "infrastructure-monitoring-log-view": "5f86709d3c27aed7a8379153b08ee5d3d90d77f5",
         "infrastructure-ui-source": "113182d6895764378dfe7fa9fa027244f3a457c4",
-        "ingest-agent-policies": "5e95e539826a40ad08fd0c1d161da0a4d86ffc6d",
+        "ingest-agent-policies": "c1818c4119259908875b4c777ae62b11ba0585cd",
         "ingest-download-sources": "279a68147e62e4d8858c09ad1cf03bd5551ce58d",
         "ingest-outputs": "daafff49255ab700e07491376fe89f04fc998b91",
         "ingest-package-policies": "60d43f475f91417d14d9df05476acf2e63e99435",

diff --git a/x-pack/plugins/fleet/server/saved_objects/index.test.ts b/x-pack/plugins/fleet/server/saved_objects/index.test.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import _ from 'lodash';
+
+import { getSavedObjectTypes } from '.';
+
+describe('space aware models', () => {
+  it('should have the same mappings for space and non-space aware agent policies', () => {
+    const soTypes = getSavedObjectTypes();
+
+    const legacyMappings = _.omit(
+      soTypes['ingest-agent-policies'].mappings,
+      'properties.monitoring_diagnostics',
+      'properties.monitoring_http',
+      'properties.monitoring_pprof_enabled'
+    );
+
+    expect(legacyMappings).toEqual(soTypes['fleet-agent-policies'].mappings);
+  });
+  it('should have the same mappings for space and non-space aware package policies', () => {
+    const soTypes = getSavedObjectTypes();
+
+    expect(soTypes['ingest-package-policies'].mappings).toEqual(
+      soTypes['fleet-package-policies'].mappings
+    );
+  });
+});
diff --git a/x-pack/plugins/fleet/server/saved_objects/index.ts b/x-pack/plugins/fleet/server/saved_objects/index.ts
@@ -213,6 +213,7 @@ export const getSavedObjectTypes = (
         importableAndExportable: false,
       },
       mappings: {
+        dynamic: false,
         properties: {
           name: { type: 'keyword' },
           schema_version: { type: 'version' },
@@ -304,6 +305,14 @@ export const getSavedObjectTypes = (
             },
           ],
         },
+        '5': {
+          changes: [
+            {
+              type: 'mappings_addition',
+              addedMappings: {},
+            },
+          ],
+        },
       },
     },
     [AGENT_POLICY_SAVED_OBJECT_TYPE]: {
@@ -315,6 +324,7 @@ export const getSavedObjectTypes = (
         importableAndExportable: false,
       },
       mappings: {
+        dynamic: false,
         properties: {
           name: { type: 'keyword' },
           schema_version: { type: 'version' },
@@ -349,6 +359,16 @@ export const getSavedObjectTypes = (
           global_data_tags: { type: 'flattened', index: false },
         },
       },
+      modelVersions: {
+        '1': {
+          changes: [
+            {
+              type: 'mappings_addition',
+              addedMappings: {},
+            },
+          ],
+        },
+      },
     },
     [OUTPUT_SAVED_OBJECT_TYPE]: {
       name: OUTPUT_SAVED_OBJECT_TYPE,