[8.x] Revert "[Response Ops][Alerting] Backfill actions schema c…

…hanges for intermediate release (#203184)" (#204218) (#204266)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Revert "[Response Ops][Alerting] Backfill actions schema changes
for intermediate release (#203184)"
(#204218)](#204218)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Ying
Mao","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-12-13T17:30:12Z","message":"Revert
\"[Response Ops][Alerting] Backfill actions schema changes for
intermediate release (#203184)\" (#204218)\n\nThis reverts commit
b9bac16.\r\n\r\n##
Summary\r\n\r\nReverting to investigate `Failed to poll for work:
Invalid interval\r\n\"PT1M\". Intervals must be of the form {number}m.
Example: 5m.` logs\r\nwhich may be caused by the updated task
schema","sha":"42693caf5f274b9cc3c30d3305961430b31d8ae3","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Feature:Alerting","release_note:skip","Team:ResponseOps","v9.0.0","backport:prev-minor","v8.18.0"],"title":"Revert
\"[Response Ops][Alerting] Backfill actions schema changes for
intermediate release
(#203184)\"","number":204218,"url":"https://github.com/elastic/kibana/pull/204218","mergeCommit":{"message":"Revert
\"[Response Ops][Alerting] Backfill actions schema changes for
intermediate release (#203184)\" (#204218)\n\nThis reverts commit
b9bac16.\r\n\r\n##
Summary\r\n\r\nReverting to investigate `Failed to poll for work:
Invalid interval\r\n\"PT1M\". Intervals must be of the form {number}m.
Example: 5m.` logs\r\nwhich may be caused by the updated task
schema","sha":"42693caf5f274b9cc3c30d3305961430b31d8ae3"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/204218","number":204218,"mergeCommit":{"message":"Revert
\"[Response Ops][Alerting] Backfill actions schema changes for
intermediate release (#203184)\" (#204218)\n\nThis reverts commit
b9bac16.\r\n\r\n##
Summary\r\n\r\nReverting to investigate `Failed to poll for work:
Invalid interval\r\n\"PT1M\". Intervals must be of the form {number}m.
Example: 5m.` logs\r\nwhich may be caused by the updated task
schema","sha":"42693caf5f274b9cc3c30d3305961430b31d8ae3"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Ying Mao <[email protected]>

packages/kbn-check-mappings-update-cli/current_fields.json

@@ -3,9 +3,7 @@
     "actionTypeId",
     "name"
   ],
-  "action_task_params": [
-    "apiKeyId"
-  ],
+  "action_task_params": [],
   "ad_hoc_run_params": [
     "apiKeyId",
     "createdAt",
@@ -1099,7 +1097,6 @@
     "enabled",
     "ownerId",
     "partition",
-    "priority",
     "retryAt",
     "runAt",
     "schedule",

packages/kbn-check-mappings-update-cli/current_mappings.json

@@ -17,11 +17,7 @@
   },
   "action_task_params": {
     "dynamic": false,
-    "properties": {
-      "apiKeyId": {
-        "type": "keyword"
-      }
-    }
+    "properties": {}
   },
   "ad_hoc_run_params": {
     "dynamic": false,
@@ -3631,9 +3627,6 @@
       "partition": {
         "type": "integer"
       },
-      "priority": {
-        "type": "integer"
-      },
       "retryAt": {
         "type": "date"
       },

src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts

@@ -57,8 +57,8 @@ describe('checking migration metadata changes on all registered SO types', () =>
     expect(hashMap).toMatchInlineSnapshot(`
       Object {
         "action": "0e6fc0b74c7312a8c11ff6b14437b93a997358b8",
-        "action_task_params": "2e475d8b62e2de50b77f58cda309efb537e1d543",
-        "ad_hoc_run_params": "c7419760e878207231c3c8a25ec4d78360e07bf7",
+        "action_task_params": "b50cb5c8a493881474918e8d4985e61374ca4c30",
+        "ad_hoc_run_params": "d4e3c5c794151d0a4f5c71e886b2aa638da73ad2",
         "alert": "556a03378f5ee1c31593c3a37c66b54555ee14ff",
         "api_key_pending_invalidation": "8f5554d1984854011b8392d9a6f7ef985bcac03c",
         "apm-custom-dashboards": "b67128f78160c288bd7efe25b2da6e2afd5e82fc",
@@ -170,7 +170,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "synthetics-private-location": "8cecc9e4f39637d2f8244eb7985c0690ceab24be",
         "synthetics-privates-locations": "f53d799d5c9bc8454aaa32c6abc99a899b025d5c",
         "tag": "e2544392fe6563e215bb677abc8b01c2601ef2dc",
-        "task": "ca8020259e46f713965a754ffae286c02d3cf05d",
+        "task": "3c89a7c918d5b896a5f8800f06e9114ad7e7aea3",
         "telemetry": "7b00bcf1c7b4f6db1192bb7405a6a63e78b699fd",
         "threshold-explorer-view": "175306806f9fc8e13fcc1c8953ec4ba89bda1b70",
         "ui-metric": "d227284528fd19904e9d972aea0a13716fc5fe24",

x-pack/plugins/actions/server/saved_objects/mappings.ts

@@ -40,9 +40,6 @@ export const actionMappings: SavedObjectsTypeMappingDefinition = {
 export const actionTaskParamsMappings: SavedObjectsTypeMappingDefinition = {
   dynamic: false,
   properties: {
-    apiKeyId: {
-      type: 'keyword',
-    },
     // NO NEED TO BE INDEXED
     // actionId: {
     //   type: 'keyword',

x-pack/plugins/actions/server/saved_objects/model_versions/action_task_params_model_versions.ts

@@ -6,28 +6,13 @@
  */
 
 import { SavedObjectsModelVersionMap } from '@kbn/core-saved-objects-server';
-import { actionTaskParamsSchemaV1, actionTaskParamsSchemaV2 } from '../schemas/action_task_params';
+import { actionTaskParamsSchemaV1 } from '../schemas/action_task_params';
 
 export const actionTaskParamsModelVersions: SavedObjectsModelVersionMap = {
   '1': {
     changes: [],
     schemas: {
-      forwardCompatibility: actionTaskParamsSchemaV1.extends({}, { unknowns: 'ignore' }),
       create: actionTaskParamsSchemaV1,
     },
   },
-  '2': {
-    changes: [
-      {
-        type: 'mappings_addition',
-        addedMappings: {
-          apiKeyId: { type: 'keyword' },
-        },
-      },
-    ],
-    schemas: {
-      forwardCompatibility: actionTaskParamsSchemaV2.extends({}, { unknowns: 'ignore' }),
-      create: actionTaskParamsSchemaV2,
-    },
-  },
 };

x-pack/plugins/actions/server/saved_objects/schemas/action_task_params/index.ts

@@ -6,4 +6,3 @@
  */
 
 export { actionTaskParamsSchema as actionTaskParamsSchemaV1 } from './v1';
-export { actionTaskParamsSchema as actionTaskParamsSchemaV2 } from './v2';

x-pack/plugins/alerting/common/routes/backfill/apis/schedule/schemas/v1.ts

@@ -15,7 +15,6 @@ export const scheduleBodySchema = schema.arrayOf(
       rule_id: schema.string(),
       start: schema.string(),
       end: schema.maybe(schema.string()),
-      run_actions: schema.maybe(schema.boolean()),
     },
     {
       validate({ start, end }) {

x-pack/plugins/alerting/server/saved_objects/model_versions/ad_hoc_run_params_model_versions.ts

@@ -6,10 +6,7 @@
  */
 
 import { SavedObjectsModelVersionMap } from '@kbn/core-saved-objects-server';
-import {
-  rawAdHocRunParamsSchemaV1,
-  rawAdHocRunParamsSchemaV2,
-} from '../schemas/raw_ad_hoc_run_params';
+import { rawAdHocRunParamsSchemaV1 } from '../schemas/raw_ad_hoc_run_params';
 
 export const adHocRunParamsModelVersions: SavedObjectsModelVersionMap = {
   '1': {
@@ -19,11 +16,4 @@ export const adHocRunParamsModelVersions: SavedObjectsModelVersionMap = {
       create: rawAdHocRunParamsSchemaV1,
     },
   },
-  '2': {
-    changes: [],
-    schemas: {
-      forwardCompatibility: rawAdHocRunParamsSchemaV2.extends({}, { unknowns: 'ignore' }),
-      create: rawAdHocRunParamsSchemaV2,
-    },
-  },
 };

x-pack/plugins/alerting/server/saved_objects/schemas/raw_ad_hoc_run_params/index.ts

@@ -6,4 +6,3 @@
  */
 
 export { rawAdHocRunParamsSchema as rawAdHocRunParamsSchemaV1 } from './v1';
-export { rawAdHocRunParamsSchema as rawAdHocRunParamsSchemaV2 } from './v2';

x-pack/plugins/alerting/server/saved_objects/schemas/raw_ad_hoc_run_params/v1.ts

@@ -21,7 +21,7 @@ const rawAdHocRunSchedule = schema.object({
   runAt: schema.string(),
 });
 
-export const rawAdHocRunParamsRuleSchema = schema.object({
+const rawAdHocRunParamsRuleSchema = schema.object({
   name: schema.string(),
   tags: schema.arrayOf(schema.string()),
   alertTypeId: schema.string(),

x-pack/plugins/task_manager/server/saved_objects/mappings.ts

@@ -65,9 +65,6 @@ export const taskMappings: SavedObjectsTypeMappingDefinition = {
     partition: {
       type: 'integer',
     },
-    priority: {
-      type: 'integer',
-    },
   },
 };
 

x-pack/plugins/task_manager/server/saved_objects/model_versions/task_model_versions.ts

@@ -6,7 +6,7 @@
  */
 
 import { SavedObjectsModelVersionMap } from '@kbn/core-saved-objects-server';
-import { taskSchemaV1, taskSchemaV2, taskSchemaV3 } from '../schemas/task';
+import { taskSchemaV1, taskSchemaV2 } from '../schemas/task';
 
 export const taskModelVersions: SavedObjectsModelVersionMap = {
   '1': {
@@ -35,18 +35,4 @@ export const taskModelVersions: SavedObjectsModelVersionMap = {
       create: taskSchemaV2,
     },
   },
-  '3': {
-    changes: [
-      {
-        type: 'mappings_addition',
-        addedMappings: {
-          priority: { type: 'integer' },
-        },
-      },
-    ],
-    schemas: {
-      forwardCompatibility: taskSchemaV3.extends({}, { unknowns: 'ignore' }),
-      create: taskSchemaV3,
-    },
-  },
 };

x-pack/plugins/task_manager/server/saved_objects/schemas/task.ts

@@ -42,7 +42,3 @@ export const taskSchemaV1 = schema.object({
 export const taskSchemaV2 = taskSchemaV1.extends({
   partition: schema.maybe(schema.number()),
 });
-
-export const taskSchemaV3 = taskSchemaV2.extends({
-  priority: schema.maybe(schema.number()),
-});