Merge branch '165812-infra-ui-rename-disk-usage-charts' of https://gi…

…thub.com/jennypavlova/kibana into 165812-infra-ui-rename-disk-usage-charts

.buildkite/pipelines/pipeline.kibana-serverless-release.yaml

@@ -10,3 +10,6 @@ steps:
         SERVICE: kibana-controller
         NAMESPACE: kibana-ci
         IMAGE_NAME: kibana-serverless
+
+notify:
+  - slack: "#kibana-mission-control"

config/serverless.es.yml

@@ -9,6 +9,7 @@ xpack.observability.enabled: false
 xpack.securitySolution.enabled: false
 xpack.serverless.observability.enabled: false
 xpack.uptime.enabled: false
+xpack.legacy_uptime.enabled: false
 enterpriseSearch.enabled: false
 monitoring.ui.enabled: false
 xpack.fleet.enabled: false

config/serverless.oblt.yml

@@ -4,6 +4,8 @@
 enterpriseSearch.enabled: false
 xpack.cloudSecurityPosture.enabled: false
 xpack.securitySolution.enabled: false
+xpack.uptime.enabled: false
+xpack.legacy_uptime.enabled: false
 
 ## Enable the Serverless Observability plugin
 xpack.serverless.observability.enabled: true
@@ -24,7 +26,7 @@ xpack.fleet.agentIdVerificationEnabled: false
 xpack.apm.serverlessOnboarding: true
 
 # Fleet specific configuration
-xpack.fleet.internal.capabilities: ['apm', 'uptime', 'observability']
+xpack.fleet.internal.capabilities: ['apm', 'observability']
 
 ## Required for force installation of APM Package
 xpack.fleet.packages:

config/serverless.security.yml

@@ -5,6 +5,7 @@ enterpriseSearch.enabled: false
 xpack.apm.enabled: false
 xpack.observability.enabled: false
 xpack.uptime.enabled: false
+xpack.legacy_uptime.enabled: false
 
 ## Enable the Security Solution Serverless plugin
 xpack.securitySolutionServerless.enabled: true

config/serverless.yml

@@ -119,6 +119,7 @@ xpack.alerting.rules.run.ruleTypeOverrides:
 xpack.alerting.rules.minimumScheduleInterval.enforce: true
 xpack.alerting.rules.maxScheduledPerMinute: 400
 xpack.actions.run.maxAttempts: 10
+xpack.actions.queued.max: 10000
 
 # Disables ESQL in advanced settings (hides it from the UI)
 uiSettings:

docs/settings/alert-action-settings.asciidoc

@@ -227,6 +227,9 @@ xpack.actions.run:
           maxAttempts: 5
 --
 
+`xpack.actions.queued.max` {ess-icon}::
+Specifies the maximum number of actions that can be queued. Default: 1000000
+
 [float]
 [[preconfigured-connector-settings]]
 === Preconfigured connector settings

packages/kbn-config-schema/index.ts

@@ -140,6 +140,22 @@ function recordOf<K extends string, V>(
   return new RecordOfType(keyType, valueType, options);
 }
 
+function oneOf<A, B, C, D, E, F, G, H, I, J, K>(
+  types: [
+    Type<A>,
+    Type<B>,
+    Type<C>,
+    Type<D>,
+    Type<E>,
+    Type<F>,
+    Type<G>,
+    Type<H>,
+    Type<I>,
+    Type<J>,
+    Type<K>
+  ],
+  options?: TypeOptions<A | B | C | D | E | F | G | H | I | J | K>
+): Type<A | B | C | D | E | F | G | H | I | J | K>;
 function oneOf<A, B, C, D, E, F, G, H, I, J>(
   types: [Type<A>, Type<B>, Type<C>, Type<D>, Type<E>, Type<F>, Type<G>, Type<H>, Type<I>, Type<J>],
   options?: TypeOptions<A | B | C | D | E | F | G | H | I | J>

packages/kbn-securitysolution-list-api/src/api/index.ts

@@ -43,6 +43,8 @@ import {
 } from '@kbn/securitysolution-list-constants';
 import { toError, toPromise } from '../fp_utils';
 
+const version = '2023-10-31';
+
 /**
  * Add new ExceptionList
  *
@@ -62,6 +64,7 @@ const addExceptionList = async ({
     body: JSON.stringify(list),
     method: 'POST',
     signal,
+    version,
   });
 
 const addExceptionListWithValidation = async ({
@@ -105,6 +108,7 @@ const addExceptionListItem = async ({
     body: JSON.stringify(listItem),
     method: 'POST',
     signal,
+    version,
   });
 
 const addExceptionListItemWithValidation = async ({
@@ -148,6 +152,7 @@ const updateExceptionList = async ({
     body: JSON.stringify(list),
     method: 'PUT',
     signal,
+    version,
   });
 
 const updateExceptionListWithValidation = async ({
@@ -191,6 +196,7 @@ const updateExceptionListItem = async ({
     body: JSON.stringify(listItem),
     method: 'PUT',
     signal,
+    version,
   });
 
 const updateExceptionListItemWithValidation = async ({
@@ -247,6 +253,7 @@ const fetchExceptionLists = async ({
     method: 'GET',
     query,
     signal,
+    version,
   });
 };
 
@@ -298,6 +305,7 @@ const fetchExceptionListById = async ({
     method: 'GET',
     query: { id, namespace_type: namespaceType },
     signal,
+    version,
   });
 
 const fetchExceptionListByIdWithValidation = async ({
@@ -361,6 +369,7 @@ const fetchExceptionListsItemsByListIds = async ({
     method: 'GET',
     query,
     signal,
+    version,
   });
 };
 
@@ -414,6 +423,7 @@ const fetchExceptionListItemById = async ({
     method: 'GET',
     query: { id, namespace_type: namespaceType },
     signal,
+    version,
   });
 
 const fetchExceptionListItemByIdWithValidation = async ({
@@ -450,6 +460,7 @@ const deleteExceptionListById = async ({
     method: 'DELETE',
     query: { id, namespace_type: namespaceType },
     signal,
+    version,
   });
 
 const deleteExceptionListByIdWithValidation = async ({
@@ -486,6 +497,7 @@ const deleteExceptionListItemById = async ({
     method: 'DELETE',
     query: { id, namespace_type: namespaceType },
     signal,
+    version,
   });
 
 const deleteExceptionListItemByIdWithValidation = async ({
@@ -518,6 +530,7 @@ const addEndpointExceptionList = async ({
   http.fetch<ExceptionListItemSchema>(ENDPOINT_LIST_URL, {
     method: 'POST',
     signal,
+    version,
   });
 
 const addEndpointExceptionListWithValidation = async ({
@@ -561,6 +574,7 @@ export const exportExceptionList = async ({
       include_expired_exceptions: includeExpiredExceptions,
     },
     signal,
+    version,
   });
 
 /**
@@ -647,4 +661,5 @@ export const duplicateExceptionList = async ({
       include_expired_exceptions: includeExpiredExceptions,
     },
     signal,
+    version,
   });

packages/kbn-securitysolution-list-api/src/list_api/index.ts

@@ -57,6 +57,8 @@ export type {
   ImportListParams,
 } from './types';
 
+const version = '2023-10-31';
+
 const findLists = async ({
   http,
   cursor,
@@ -79,6 +81,7 @@ const findLists = async ({
       sort_order,
     },
     signal,
+    version,
   });
 };
 
@@ -167,6 +170,7 @@ const importList = async ({
     method: 'POST',
     query: { list_id, type },
     signal,
+    version,
   });
 };
 
@@ -207,6 +211,7 @@ const deleteList = async ({
     method: 'DELETE',
     query: { deleteReferences, id, ignoreReferences },
     signal,
+    version,
   });
 
 const deleteListWithValidation = async ({
@@ -236,6 +241,7 @@ const exportList = async ({
     method: 'POST',
     query: { list_id },
     signal,
+    version,
   });
 
 const exportListWithValidation = async ({
@@ -256,6 +262,7 @@ const readListIndex = async ({ http, signal }: ApiParams): Promise<ListItemIndex
   http.fetch<ListItemIndexExistSchema>(LIST_INDEX, {
     method: 'GET',
     signal,
+    version,
   });
 
 const readListIndexWithValidation = async ({
@@ -273,15 +280,16 @@ export { readListIndexWithValidation as readListIndex };
 // TODO add types and validation
 export const readListPrivileges = async ({ http, signal }: ApiParams): Promise<unknown> =>
   http.fetch<unknown>(LIST_PRIVILEGES_URL, {
-    version: '2023-10-31',
     method: 'GET',
     signal,
+    version,
   });
 
 const createListIndex = async ({ http, signal }: ApiParams): Promise<AcknowledgeSchema> =>
   http.fetch<AcknowledgeSchema>(LIST_INDEX, {
     method: 'POST',
     signal,
+    version,
   });
 
 const createListIndexWithValidation = async ({

x-pack/plugins/actions/server/actions_client/actions_client.test.ts

@@ -3019,6 +3019,7 @@ describe('bulkEnqueueExecution()', () => {
           executionId: '123abc',
           apiKey: null,
           source: asHttpRequestExecutionSource(request),
+          actionTypeId: 'my-action-type',
         },
         {
           id: uuidv4(),
@@ -3027,6 +3028,7 @@ describe('bulkEnqueueExecution()', () => {
           executionId: '456def',
           apiKey: null,
           source: asHttpRequestExecutionSource(request),
+          actionTypeId: 'my-action-type',
         },
       ]);
       expect(authorization.ensureAuthorized).toHaveBeenCalledWith({
@@ -3051,6 +3053,7 @@ describe('bulkEnqueueExecution()', () => {
             executionId: '123abc',
             apiKey: null,
             source: asHttpRequestExecutionSource(request),
+            actionTypeId: 'my-action-type',
           },
           {
             id: uuidv4(),
@@ -3059,6 +3062,7 @@ describe('bulkEnqueueExecution()', () => {
             executionId: '456def',
             apiKey: null,
             source: asHttpRequestExecutionSource(request),
+            actionTypeId: 'my-action-type',
           },
         ])
       ).rejects.toMatchInlineSnapshot(`[Error: Unauthorized to execute all actions]`);
@@ -3081,6 +3085,7 @@ describe('bulkEnqueueExecution()', () => {
           executionId: '123abc',
           apiKey: null,
           source: asHttpRequestExecutionSource(request),
+          actionTypeId: 'my-action-type',
         },
         {
           id: uuidv4(),
@@ -3089,6 +3094,7 @@ describe('bulkEnqueueExecution()', () => {
           executionId: '456def',
           apiKey: null,
           source: asHttpRequestExecutionSource(request),
+          actionTypeId: 'my-action-type',
         },
       ]);
 
@@ -3112,6 +3118,7 @@ describe('bulkEnqueueExecution()', () => {
         executionId: '123abc',
         apiKey: null,
         source: asHttpRequestExecutionSource(request),
+        actionTypeId: 'my-action-type',
       },
       {
         id: uuidv4(),
@@ -3120,6 +3127,7 @@ describe('bulkEnqueueExecution()', () => {
         executionId: '456def',
         apiKey: null,
         source: asHttpRequestExecutionSource(request),
+        actionTypeId: 'my-action-type',
       },
     ];
     await expect(actionsClient.bulkEnqueueExecution(opts)).resolves.toMatchInlineSnapshot(

x-pack/plugins/actions/server/actions_client/actions_client.ts

@@ -55,6 +55,7 @@ import {
   ExecutionEnqueuer,
   ExecuteOptions as EnqueueExecutionOptions,
   BulkExecutionEnqueuer,
+  ExecutionResponse,
 } from '../create_execute_function';
 import { ActionsAuthorization } from '../authorization/actions_authorization';
 import {
@@ -114,7 +115,7 @@ export interface ConstructorOptions {
   inMemoryConnectors: InMemoryConnector[];
   actionExecutor: ActionExecutorContract;
   ephemeralExecutionEnqueuer: ExecutionEnqueuer<RunNowResult>;
-  bulkExecutionEnqueuer: BulkExecutionEnqueuer<void>;
+  bulkExecutionEnqueuer: BulkExecutionEnqueuer<ExecutionResponse>;
   request: KibanaRequest;
   authorization: ActionsAuthorization;
   auditLogger?: AuditLogger;
@@ -139,7 +140,7 @@ export interface ActionsClientContext {
   request: KibanaRequest;
   authorization: ActionsAuthorization;
   ephemeralExecutionEnqueuer: ExecutionEnqueuer<RunNowResult>;
-  bulkExecutionEnqueuer: BulkExecutionEnqueuer<void>;
+  bulkExecutionEnqueuer: BulkExecutionEnqueuer<ExecutionResponse>;
   auditLogger?: AuditLogger;
   usageCounter?: UsageCounter;
   connectorTokenClient: ConnectorTokenClientContract;
@@ -766,7 +767,9 @@ export class ActionsClient {
     });
   }
 
-  public async bulkEnqueueExecution(options: EnqueueExecutionOptions[]): Promise<void> {
+  public async bulkEnqueueExecution(
+    options: EnqueueExecutionOptions[]
+  ): Promise<ExecutionResponse> {
     const sources: Array<ActionExecutionSource<unknown>> = [];
     options.forEach((option) => {
       if (option.source) {

x-pack/plugins/actions/server/actions_config.mock.ts

@@ -28,6 +28,7 @@ const createActionsConfigMock = () => {
     validateEmailAddresses: jest.fn().mockReturnValue(undefined),
     getMaxAttempts: jest.fn().mockReturnValue(3),
     enableFooterInEmail: jest.fn().mockReturnValue(true),
+    getMaxQueued: jest.fn().mockReturnValue(1000),
   };
   return mocked;
 };

x-pack/plugins/actions/server/actions_config.test.ts

@@ -563,3 +563,20 @@ describe('getMaxAttempts()', () => {
     expect(maxAttempts).toEqual(3);
   });
 });
+
+describe('getMaxQueued()', () => {
+  test('returns the queued actions max defined in config', () => {
+    const acu = getActionsConfigurationUtilities({
+      ...defaultActionsConfig,
+      queued: { max: 1 },
+    });
+    const max = acu.getMaxQueued();
+    expect(max).toEqual(1);
+  });
+
+  test('returns the default queued actions max', () => {
+    const acu = getActionsConfigurationUtilities(defaultActionsConfig);
+    const max = acu.getMaxQueued();
+    expect(max).toEqual(1000000);
+  });
+});