Merge branch '8.x' into backport/8.x/pr-193960

packages/content-management/table_list_view_table/src/components/updated_at_field.tsx

@@ -47,7 +47,7 @@ export const UpdatedAtField: FC<{ dateTime?: string; DateFormatterComp?: DateFor
   }
   return (
     <EuiToolTip content={updatedAt.format('LL LT')}>
-      <span>{updatedAt.format('LL')}</span>
+      <span>{updatedAt.format('ll')}</span>
     </EuiToolTip>
   );
 };

packages/content-management/table_list_view_table/src/table_list_view.test.tsx

@@ -269,8 +269,8 @@ describe('TableListView', () => {
 
       expect(tableCellsValues).toEqual([
         // Renders the datetime with this format: "July 28, 2022"
-        ['Item 1Item 1 description', updatedAtValues[0].format('LL')],
-        ['Item 2Item 2 description', updatedAtValues[1].format('LL')],
+        ['Item 1Item 1 description', updatedAtValues[0].format('ll')],
+        ['Item 2Item 2 description', updatedAtValues[1].format('ll')],
       ]);
     });
 
@@ -1132,11 +1132,11 @@ describe('TableListView', () => {
         Array [
           Array [
             "Item 1",
-            "July 15, 2023",
+            "Jul 15, 2023",
           ],
           Array [
             "Item 2",
-            "July 15, 2023",
+            "Jul 15, 2023",
           ],
         ]
       `);
@@ -1166,7 +1166,7 @@ describe('TableListView', () => {
         Array [
           Array [
             "Item from search",
-            "July 1, 2023",
+            "Jul 1, 2023",
           ],
         ]
       `);
@@ -1208,11 +1208,11 @@ describe('TableListView', () => {
         Array [
           Array [
             "Item 1",
-            "July 15, 2023",
+            "Jul 15, 2023",
           ],
           Array [
             "Item 2",
-            "July 15, 2023",
+            "Jul 15, 2023",
           ],
         ]
       `);

packages/kbn-investigation-shared/src/rest_specs/create.ts

@@ -20,6 +20,7 @@ const createInvestigationParamsSchema = z.object({
     }),
     origin: z.union([alertOriginSchema, blankOriginSchema]),
     tags: z.array(z.string()),
+    externalIncidentUrl: z.string().nullable(),
   }),
 });
 

packages/kbn-investigation-shared/src/rest_specs/update.ts

@@ -23,6 +23,7 @@ const updateInvestigationParamsSchema = z.object({
         timeRange: z.object({ from: z.number(), to: z.number() }),
       }),
       tags: z.array(z.string()),
+      externalIncidentUrl: z.string().nullable(),
     })
     .partial(),
 });

packages/kbn-investigation-shared/src/schema/investigation.ts

@@ -34,6 +34,7 @@ const investigationSchema = z.object({
   tags: z.array(z.string()),
   notes: z.array(investigationNoteSchema),
   items: z.array(investigationItemSchema),
+  externalIncidentUrl: z.string().nullable(),
 });
 
 type Status = z.infer<typeof statusSchema>;

packages/kbn-test/src/es/test_es_cluster.ts

@@ -189,7 +189,10 @@ export function createTestEsCluster<
     `transport.port=${transportPort ?? esTestConfig.getTransportPort()}`,
     // For multi-node clusters, we make all nodes master-eligible by default.
     ...(nodes.length > 1
-      ? ['discovery.type=zen', `cluster.initial_master_nodes=${nodes.map((n) => n.name).join(',')}`]
+      ? [
+          'discovery.type=multi-node',
+          `cluster.initial_master_nodes=${nodes.map((n) => n.name).join(',')}`,
+        ]
       : ['discovery.type=single-node']),
   ];
 

x-pack/plugins/actions/docs/openapi/components/schemas/run_pushtoservice.yaml

@@ -30,6 +30,13 @@ properties:
         type: object
         description: Information necessary to create or update a Jira, ServiceNow ITSM, ServiveNow SecOps, Swimlane, or TheHive incident.
         properties:
+          additional_fields:
+            type: string
+            nullable: true
+            maxLength: 20
+            description: >
+              Additional fields for ServiceNow ITSM and ServiveNow SecOps connectors.
+              The fields must exist in the Elastic ServiceNow application and must be specified in JSON format.
           alertId:
             type: string
             description: The alert identifier for Swimlane connectors.

x-pack/plugins/cloud_security_posture/public/common/api/use_wiz_integration_route.ts

@@ -0,0 +1,21 @@
+/*
+ * 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 { pagePathGetters } from '@kbn/fleet-plugin/public';
+import { useKibana } from '../hooks/use_kibana';
+
+export const useAdd3PIntegrationRoute = (pkgkey: string) => {
+  const { http } = useKibana().services;
+
+  const path = pagePathGetters
+    .add_integration_to_policy({
+      pkgkey,
+    })
+    .join('');
+
+  return http.basePath.prepend(path);
+};

x-pack/plugins/cloud_security_posture/public/common/navigation/constants.ts

@@ -11,6 +11,7 @@ import {
   CLOUD_SECURITY_POSTURE_BASE_PATH,
 } from '@kbn/cloud-security-posture-common';
 import { NAV_ITEMS_NAMES } from '@kbn/cloud-security-posture/constants/navigation';
+import { CNVM_POLICY_TEMPLATE } from '../../../common/constants';
 import type { CspBenchmarksPage, CspPage, CspPageNavigationItem } from './types';
 
 const CSPM_DASHBOARD_TAB_NAME = 'Cloud';
@@ -71,4 +72,7 @@ export const cspIntegrationDocsNavigation = {
     gcpGetStartedPath: `https://www.elastic.co/guide/en/security/current/cspm-get-started-gcp.html`,
     azureGetStartedPath: `https://www.elastic.co/guide/en/security/current/cspm-get-started-azure.html`,
   },
+  cnvm: {
+    overviewPath: `${ELASTIC_BASE_SHORT_URL}/${CNVM_POLICY_TEMPLATE}`,
+  },
 };