Merge branch 'main' into renovate/main-ftr

oas_docs/output/kibana.serverless.yaml

@@ -7269,6 +7269,14 @@ paths:
       summary: Import saved objects
       tags:
         - saved objects
+      x-codeSamples:
+        - label: Import with createNewCopies
+          lang: cURL
+          source: |
+            curl \
+              -X POST api/saved_objects/_import?createNewCopies=true
+              -H "kbn-xsrf: true"
+              --form file=@file.ndjson
   /api/status:
     get:
       operationId: '%2Fapi%2Fstatus#0'

oas_docs/output/kibana.yaml

@@ -10201,6 +10201,14 @@ paths:
       summary: Import saved objects
       tags:
         - saved objects
+      x-codeSamples:
+        - label: Import with createNewCopies
+          lang: cURL
+          source: |
+            curl \
+              -X POST api/saved_objects/_import?createNewCopies=true
+              -H "kbn-xsrf: true"
+              --form file=@file.ndjson
   /api/saved_objects/_resolve_import_errors:
     post:
       description: >

packages/core/saved-objects/docs/openapi/bundled.json

@@ -745,7 +745,14 @@
               }
             }
           }
-        }
+        },
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "Import with createNewCopies",
+            "source": "curl \\\n  -X POST api/saved_objects/_import?createNewCopies=true\n  -H \"kbn-xsrf: true\"\n  --form file=@file.ndjson\n"
+          }
+        ]
       }
     },
     "/api/saved_objects/_resolve_import_errors": {

packages/core/saved-objects/docs/openapi/bundled.yaml

@@ -511,6 +511,14 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/400_response'
+      x-codeSamples:
+        - lang: cURL
+          label: Import with createNewCopies
+          source: |
+            curl \
+              -X POST api/saved_objects/_import?createNewCopies=true
+              -H "kbn-xsrf: true"
+              --form file=@file.ndjson
   /api/saved_objects/_resolve_import_errors:
     post:
       summary: Resolve import errors

packages/core/saved-objects/docs/openapi/bundled_serverless.json

@@ -230,7 +230,14 @@
               }
             }
           }
-        }
+        },
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "Import with createNewCopies",
+            "source": "curl \\\n  -X POST api/saved_objects/_import?createNewCopies=true\n  -H \"kbn-xsrf: true\"\n  --form file=@file.ndjson\n"
+          }
+        ]
       }
     }
   },

packages/core/saved-objects/docs/openapi/bundled_serverless.yaml

@@ -176,6 +176,14 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/400_response'
+      x-codeSamples:
+        - lang: cURL
+          label: Import with createNewCopies
+          source: |
+            curl \
+              -X POST api/saved_objects/_import?createNewCopies=true
+              -H "kbn-xsrf: true"
+              --form file=@file.ndjson
 components:
   parameters:
     kbn_xsrf:

packages/core/saved-objects/docs/openapi/paths/api@saved_objects@_import.yaml

@@ -84,3 +84,11 @@ post:
         application/json:
           schema:
             $ref: '../components/schemas/400_response.yaml'
+  x-codeSamples:
+  - lang: cURL
+    label: Import with createNewCopies
+    source: |
+      curl \
+        -X POST api/saved_objects/_import?createNewCopies=true
+        -H "kbn-xsrf: true"
+        --form file=@file.ndjson

packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts

@@ -47,6 +47,7 @@ import {
   EVENT_KIND,
   EVENT_ORIGINAL,
   TAGS,
+  ALERT_INTENDED_TIMESTAMP,
 } from '@kbn/rule-data-utils';
 import { MultiField } from './types';
 
@@ -133,6 +134,11 @@ export const alertFieldMap = {
     array: false,
     required: false,
   },
+  [ALERT_INTENDED_TIMESTAMP]: {
+    type: 'date',
+    array: false,
+    required: false,
+  },
   [ALERT_RULE_EXECUTION_UUID]: {
     type: 'keyword',
     array: false,

packages/kbn-alerts-as-data-utils/src/schemas/generated/alert_schema.ts

@@ -93,6 +93,7 @@ const AlertOptional = rt.partial({
   'kibana.alert.end': schemaDate,
   'kibana.alert.flapping': schemaBoolean,
   'kibana.alert.flapping_history': schemaBooleanArray,
+  'kibana.alert.intended_timestamp': schemaDate,
   'kibana.alert.last_detected': schemaDate,
   'kibana.alert.maintenance_window_ids': schemaStringArray,
   'kibana.alert.previous_action_group': schemaString,

packages/kbn-alerts-as-data-utils/src/schemas/generated/security_schema.ts

@@ -137,6 +137,7 @@ const SecurityAlertOptional = rt.partial({
   'kibana.alert.group.id': schemaString,
   'kibana.alert.group.index': schemaNumber,
   'kibana.alert.host.criticality_level': schemaString,
+  'kibana.alert.intended_timestamp': schemaDate,
   'kibana.alert.last_detected': schemaDate,
   'kibana.alert.maintenance_window_ids': schemaStringArray,
   'kibana.alert.new_terms': schemaStringArray,

packages/kbn-rule-data-utils/src/default_alerts_as_data.ts

@@ -59,6 +59,9 @@ const ALERT_INSTANCE_ID = `${ALERT_NAMESPACE}.instance.id` as const;
 // kibana.alert.last_detected - timestamp when the alert was last seen
 const ALERT_LAST_DETECTED = `${ALERT_NAMESPACE}.last_detected` as const;
 
+// kiana.alert.intended_timestamp - timestamp when the alert was intended to be detected, useful for backfilling
+const ALERT_INTENDED_TIMESTAMP = `${ALERT_NAMESPACE}.intended_timestamp` as const;
+
 // kibana.alert.reason - human readable reason that this alert is active
 const ALERT_REASON = `${ALERT_NAMESPACE}.reason` as const;
 
@@ -141,6 +144,7 @@ const fields = {
   ALERT_RULE_CATEGORY,
   ALERT_RULE_CONSUMER,
   ALERT_RULE_EXECUTION_TIMESTAMP,
+  ALERT_INTENDED_TIMESTAMP,
   ALERT_RULE_EXECUTION_UUID,
   ALERT_RULE_NAME,
   ALERT_RULE_PARAMETERS,
@@ -185,6 +189,7 @@ export {
   ALERT_RULE_CATEGORY,
   ALERT_RULE_CONSUMER,
   ALERT_RULE_EXECUTION_TIMESTAMP,
+  ALERT_INTENDED_TIMESTAMP,
   ALERT_RULE_EXECUTION_UUID,
   ALERT_RULE_NAME,
   ALERT_RULE_PARAMETERS,

src/plugins/dashboard/public/dashboard_actions/index.ts

@@ -17,10 +17,8 @@ import { CopyToDashboardAction } from './copy_to_dashboard_action';
 import { ExpandPanelAction } from './expand_panel_action';
 import { ExportCSVAction } from './export_csv_action';
 import { FiltersNotificationAction } from './filters_notification_action';
-import { LegacyLibraryNotificationAction } from './legacy_library_notification_action';
 import { UnlinkFromLibraryAction } from './unlink_from_library_action';
 import { LegacyUnlinkFromLibraryAction } from './legacy_unlink_from_library_action';
-import { LibraryNotificationAction } from './library_notification_action';
 
 interface BuildAllDashboardActionsProps {
   core: CoreStart;
@@ -64,20 +62,10 @@ export const buildAllDashboardActions = async ({
     uiActions.registerAction(unlinkFromLibraryAction);
     uiActions.attachAction(CONTEXT_MENU_TRIGGER, unlinkFromLibraryAction.id);
 
-    const libraryNotificationAction = new LibraryNotificationAction(unlinkFromLibraryAction);
-    uiActions.registerAction(libraryNotificationAction);
-    uiActions.attachAction(PANEL_NOTIFICATION_TRIGGER, libraryNotificationAction.id);
-
     const legacyUnlinkFromLibraryAction = new LegacyUnlinkFromLibraryAction();
     uiActions.registerAction(legacyUnlinkFromLibraryAction);
     uiActions.attachAction(CONTEXT_MENU_TRIGGER, legacyUnlinkFromLibraryAction.id);
 
-    const legacyLibraryNotificationAction = new LegacyLibraryNotificationAction(
-      legacyUnlinkFromLibraryAction
-    );
-    uiActions.registerAction(legacyLibraryNotificationAction);
-    uiActions.attachAction(PANEL_NOTIFICATION_TRIGGER, legacyLibraryNotificationAction.id);
-
     const copyToDashboardAction = new CopyToDashboardAction(core);
     uiActions.registerAction(copyToDashboardAction);
     uiActions.attachAction(CONTEXT_MENU_TRIGGER, copyToDashboardAction.id);