Merge branch '7.x' into backport/7.x/pr-56842

packages/kbn-pm/dist/index.js

@@ -88441,7 +88441,7 @@ module.exports = function kindOf(val) {
 };
 
 function ctorName(val) {
- return val.constructor ? val.constructor.name : null;
+ return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
 function isArray(val) {
@@ -88652,7 +88652,7 @@ module.exports = function kindOf(val) {
 };
 
 function ctorName(val) {
- return val.constructor ? val.constructor.name : null;
+ return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
 function isArray(val) {
@@ -88843,7 +88843,7 @@ module.exports = function kindOf(val) {
 };
 
 function ctorName(val) {
- return val.constructor ? val.constructor.name : null;
+ return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
 function isArray(val) {
@@ -101920,7 +101920,7 @@ module.exports = function kindOf(val) {
 };
 
 function ctorName(val) {
- return val.constructor ? val.constructor.name : null;
+ return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
 function isArray(val) {
@@ -104779,7 +104779,7 @@ module.exports = function kindOf(val) {
 };
 
 function ctorName(val) {
- return val.constructor ? val.constructor.name : null;
+ return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
 function isArray(val) {

x-pack/legacy/plugins/apm/server/routes/settings/agent_configuration.ts

@@ -117,10 +117,19 @@ export const createAgentConfigurationRoute = createRoute(() => ({
  },
  handler: async ({ context, request }) => {
  const setup = await setupRequest(context, request);
- return await createOrUpdateConfiguration({
- configuration: context.params.body,
+ const configuration = context.params.body;
+
+ // TODO: Remove logger. Only added temporarily to debug flaky test (https:/elastic/kibana/issues/51764)
+ context.logger.info(
+ `Hitting: /api/apm/settings/agent-configuration/new with ${configuration.service.name}/${configuration.service.environment}`
+ );
+ const res = await createOrUpdateConfiguration({
+ configuration,
  setup
  });
+ context.logger.info(`Created agent configuration`);
+
+ return res;
  }
 }));
 
@@ -161,8 +170,14 @@ export const agentConfigurationSearchRoute = createRoute(core => ({
  })
  },
  handler: async ({ context, request }) => {
- const setup = await setupRequest(context, request);
  const { body } = context.params;
+
+ // TODO: Remove logger. Only added temporarily to debug flaky test (https:/elastic/kibana/issues/51764)
+ context.logger.info(
+ `Hitting: /api/apm/settings/agent-configuration/search for ${body.service.name}/${body.service.environment}`
+ );
+
+ const setup = await setupRequest(context, request);
  const config = await searchConfigurations({
  serviceName: body.service.name,
  environment: body.service.environment,
@@ -176,6 +191,10 @@ export const agentConfigurationSearchRoute = createRoute(core => ({
  throw new Boom('Not found', { statusCode: 404 });
  }
 
+ context.logger.info(
+ `Config was found for ${body.service.name}/${body.service.environment}`
+ );
+
  // update `applied_by_agent` field if etags match
  if (body.etag === config._source.etag && !config._source.applied_by_agent) {
  markAppliedByAgent({ id: config._id, body: config._source, setup });

x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts

@@ -139,7 +139,7 @@ export const enableRules = async ({ ids, enabled }: EnableRulesProps): Promise<R
  const response = await KibanaServices.get().http.fetch<Rule[]>(
  `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
  {
- method: 'PUT',
+ method: 'PATCH',
  body: JSON.stringify(ids.map(id => ({ id, enabled }))),
  asResponse: true,
  }
@@ -160,7 +160,7 @@ export const deleteRules = async ({ ids }: DeleteRulesProps): Promise<Array<Rule
  const response = await KibanaServices.get().http.fetch<Rule[]>(
  `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
  {
- method: 'PUT',
+ method: 'DELETE',
  body: JSON.stringify(ids.map(id => ({ id }))),
  asResponse: true,
  }

x-pack/legacy/plugins/siem/public/hooks/api/api.tsx

@@ -36,6 +36,8 @@ export const throwIfNotOk = async (response?: Response): Promise<void> => {
  if (body != null && body.message) {
  if (body.statusCode != null) {
  throw new ToasterErrors([body.message, `${i18n.STATUS_CODE} ${body.statusCode}`]);
+ } else if (body.status_code != null) {
+ throw new ToasterErrors([body.message, `${i18n.STATUS_CODE} ${body.status_code}`]);
  } else {
  throw new ToasterErrors([body.message]);
  }

x-pack/legacy/plugins/siem/public/utils/api/index.ts

@@ -8,6 +8,7 @@ export interface MessageBody {
  error?: string;
  message?: string;
  statusCode?: number;
+ status_code?: number;
 }
 
 export const parseJsonFromBody = async (response: Response): Promise<MessageBody | null> => {

x-pack/legacy/plugins/siem/server/kibana.index.ts

@@ -13,7 +13,7 @@ import { readIndexRoute } from './lib/detection_engine/routes/index/read_index_r
 import { readRulesRoute } from './lib/detection_engine/routes/rules/read_rules_route';
 import { findRulesRoute } from './lib/detection_engine/routes/rules/find_rules_route';
 import { deleteRulesRoute } from './lib/detection_engine/routes/rules/delete_rules_route';
-import { updateRulesRoute } from './lib/detection_engine/routes/rules/update_rules_route';
+import { patchRulesRoute } from './lib/detection_engine/routes/rules/patch_rules_route';
 import { setSignalsStatusRoute } from './lib/detection_engine/routes/signals/open_close_signals_route';
 import { querySignalsRoute } from './lib/detection_engine/routes/signals/query_signals_route';
 import { ServerFacade } from './types';
@@ -23,12 +23,14 @@ import { readTagsRoute } from './lib/detection_engine/routes/tags/read_tags_rout
 import { readPrivilegesRoute } from './lib/detection_engine/routes/privileges/read_privileges_route';
 import { addPrepackedRulesRoute } from './lib/detection_engine/routes/rules/add_prepackaged_rules_route';
 import { createRulesBulkRoute } from './lib/detection_engine/routes/rules/create_rules_bulk_route';
-import { updateRulesBulkRoute } from './lib/detection_engine/routes/rules/update_rules_bulk_route';
+import { patchRulesBulkRoute } from './lib/detection_engine/routes/rules/patch_rules_bulk_route';
 import { deleteRulesBulkRoute } from './lib/detection_engine/routes/rules/delete_rules_bulk_route';
 import { importRulesRoute } from './lib/detection_engine/routes/rules/import_rules_route';
 import { exportRulesRoute } from './lib/detection_engine/routes/rules/export_rules_route';
 import { findRulesStatusesRoute } from './lib/detection_engine/routes/rules/find_rules_status_route';
 import { getPrepackagedRulesStatusRoute } from './lib/detection_engine/routes/rules/get_prepackaged_rules_status_route';
+import { updateRulesRoute } from './lib/detection_engine/routes/rules/update_rules_route';
+import { updateRulesBulkRoute } from './lib/detection_engine/routes/rules/update_rules_bulk_route';
 
 const APP_ID = 'siem';
 
@@ -50,12 +52,14 @@ export const initServerWithKibana = (context: PluginInitializerContext, __legacy
  updateRulesRoute(__legacy);
  deleteRulesRoute(__legacy);
  findRulesRoute(__legacy);
+ patchRulesRoute(__legacy);
 
  addPrepackedRulesRoute(__legacy);
  getPrepackagedRulesStatusRoute(__legacy);
  createRulesBulkRoute(__legacy);
  updateRulesBulkRoute(__legacy);
  deleteRulesBulkRoute(__legacy);
+ patchRulesBulkRoute(__legacy);
 
  importRulesRoute(__legacy);
  exportRulesRoute(__legacy);

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts

@@ -108,6 +108,14 @@ export const getUpdateRequest = (): ServerInjectOptions => ({
  },
 });
 
+export const getPatchRequest = (): ServerInjectOptions => ({
+ method: 'PATCH',
+ url: DETECTION_ENGINE_RULES_URL,
+ payload: {
+ ...typicalPayload(),
+ },
+});
+
 export const getReadRequest = (): ServerInjectOptions => ({
  method: 'GET',
  url: `${DETECTION_ENGINE_RULES_URL}?rule_id=rule-1`,
@@ -130,6 +138,12 @@ export const getUpdateBulkRequest = (): ServerInjectOptions => ({
  payload: [typicalPayload()],
 });
 
+export const getPatchBulkRequest = (): ServerInjectOptions => ({
+ method: 'PATCH',
+ url: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+ payload: [typicalPayload()],
+});
+
 export const getDeleteBulkRequest = (): ServerInjectOptions => ({
  method: 'DELETE',
  url: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/create_index_route.ts

@@ -5,7 +5,6 @@
  */
 
 import Hapi from 'hapi';
-import Boom from 'boom';
 
 import { DETECTION_ENGINE_INDEX_URL } from '../../../../../common/constants';
 import signalsPolicy from './signals_policy.json';
@@ -31,13 +30,18 @@ export const createCreateIndexRoute = (server: ServerFacade): Hapi.ServerRoute =
  },
  },
  },
- async handler(request: RequestFacade) {
+ async handler(request: RequestFacade, headers) {
  try {
  const index = getIndex(request, server);
  const callWithRequest = callWithRequestFactory(request, server);
  const indexExists = await getIndexExists(callWithRequest, index);
  if (indexExists) {
- return new Boom(`index: "${index}" already exists`, { statusCode: 409 });
+ return headers
+ .response({
+ message: `index: "${index}" already exists`,
+ status_code: 409,
+ })
+ .code(409);
  } else {
  const policyExists = await getPolicyExists(callWithRequest, index);
  if (!policyExists) {
@@ -52,7 +56,13 @@ export const createCreateIndexRoute = (server: ServerFacade): Hapi.ServerRoute =
  return { acknowledged: true };
  }
  } catch (err) {
- return transformError(err);
+ const error = transformError(err);
+ return headers
+ .response({
+ message: error.message,
+ status_code: error.statusCode,
+ })
+ .code(error.statusCode);
  }
  },
  };

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/delete_index_route.ts

@@ -5,7 +5,6 @@
  */
 
 import Hapi from 'hapi';
-import Boom from 'boom';
 
 import { DETECTION_ENGINE_INDEX_URL } from '../../../../../common/constants';
 import { ServerFacade, RequestFacade } from '../../../../types';
@@ -39,13 +38,18 @@ export const createDeleteIndexRoute = (server: ServerFacade): Hapi.ServerRoute =
  },
  },
  },
- async handler(request: RequestFacade) {
+ async handler(request: RequestFacade, headers) {
  try {
  const index = getIndex(request, server);
  const callWithRequest = callWithRequestFactory(request, server);
  const indexExists = await getIndexExists(callWithRequest, index);
  if (!indexExists) {
- return new Boom(`index: "${index}" does not exist`, { statusCode: 404 });
+ return headers
+ .response({
+ message: `index: "${index}" does not exist`,
+ status_code: 404,
+ })
+ .code(404);
  } else {
  await deleteAllIndex(callWithRequest, `${index}-*`);
  const policyExists = await getPolicyExists(callWithRequest, index);
@@ -59,7 +63,13 @@ export const createDeleteIndexRoute = (server: ServerFacade): Hapi.ServerRoute =
  return { acknowledged: true };
  }
  } catch (err) {
- return transformError(err);
+ const error = transformError(err);
+ return headers
+ .response({
+ message: error.message,
+ status_code: error.statusCode,
+ })
+ .code(error.statusCode);
  }
  },
  };

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/read_index_route.ts

@@ -5,7 +5,6 @@
  */
 
 import Hapi from 'hapi';
-import Boom from 'boom';
 
 import { DETECTION_ENGINE_INDEX_URL } from '../../../../../common/constants';
 import { ServerFacade, RequestFacade } from '../../../../types';
@@ -42,11 +41,22 @@ export const createReadIndexRoute = (server: ServerFacade): Hapi.ServerRoute =>
  if (request.method.toLowerCase() === 'head') {
  return headers.response().code(404);
  } else {
- return new Boom('index for this space does not exist', { statusCode: 404 });
+ return headers
+ .response({
+ message: 'index for this space does not exist',
+ status_code: 404,
+ })
+ .code(404);
  }
  }
  } catch (err) {
- return transformError(err);
+ const error = transformError(err);
+ return headers
+ .response({
+ message: error.message,
+ status_code: error.statusCode,
+ })
+ .code(error.statusCode);
  }
  },
  };

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts

@@ -24,7 +24,7 @@ export const createReadPrivilegesRulesRoute = (server: ServerFacade): Hapi.Serve
  },
  },
  },
- async handler(request: RulesRequest) {
+ async handler(request: RulesRequest, headers) {
  try {
  const callWithRequest = callWithRequestFactory(request, server);
  const index = getIndex(request, server);
@@ -35,7 +35,13 @@ export const createReadPrivilegesRulesRoute = (server: ServerFacade): Hapi.Serve
  has_encryption_key: !usingEphemeralEncryptionKey,
  });
  } catch (err) {
- return transformError(err);
+ const error = transformError(err);
+ return headers
+ .response({
+ message: error.message,
+ status_code: error.statusCode,
+ })
+ .code(error.statusCode);
  }
  },
  };

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts

@@ -85,10 +85,9 @@ describe('add_prepackaged_rules_route', () => {
  alertsClient.create.mockResolvedValue(getResult());
  const { payload } = await server.inject(addPrepackagedRulesRequest());
  expect(JSON.parse(payload)).toEqual({
- error: 'Bad Request',
  message:
  'Pre-packaged rules cannot be installed until the space index is created: .siem-signals-default',
- statusCode: 400,
+ status_code: 400,
  });
  });
  });

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts

@@ -6,7 +6,6 @@
 
 import Hapi from 'hapi';
 import { isFunction } from 'lodash/fp';
-import Boom from 'boom';
 
 import { DETECTION_ENGINE_PREPACKAGED_URL } from '../../../../../common/constants';
 import { ServerFacade, RequestFacade } from '../../../../types';
@@ -56,9 +55,12 @@ export const createAddPrepackedRulesRoute = (server: ServerFacade): Hapi.ServerR
  if (rulesToInstall.length !== 0 || rulesToUpdate.length !== 0) {
  const spaceIndexExists = await getIndexExists(callWithRequest, spaceIndex);
  if (!spaceIndexExists) {
- return Boom.badRequest(
- `Pre-packaged rules cannot be installed until the space index is created: ${spaceIndex}`
- );
+ return headers
+ .response({
+ message: `Pre-packaged rules cannot be installed until the space index is created: ${spaceIndex}`,
+ status_code: 400,
+ })
+ .code(400);
  }
  }
  await Promise.all(
@@ -76,7 +78,13 @@ export const createAddPrepackedRulesRoute = (server: ServerFacade): Hapi.ServerR
  rules_updated: rulesToUpdate.length,
  };
  } catch (err) {
- return transformError(err);
+ const error = transformError(err);
+ return headers
+ .response({
+ message: error.message,
+ status_code: error.statusCode,
+ })
+ .code(error.statusCode);
  }
  },
  };