Merge branch 'main' into maximizing-serverless-coverage/templates

elastic · Oct 9, 2023 · e24ab03 · e24ab03
2 parents de0a07b + fb23474
commit e24ab03
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 2,030 deletions.
diff --git a/x-pack/plugins/security_solution/public/detections/mitre/mitre_tactics_techniques.ts b/x-pack/plugins/security_solution/public/detections/mitre/mitre_tactics_techniques.ts
diff --git a/x-pack/plugins/security_solution/scripts/extract_tactics_techniques_mitre.js b/x-pack/plugins/security_solution/scripts/extract_tactics_techniques_mitre.js
@@ -83,6 +83,8 @@ const getIdReference = (references) => {
   }
 };
 
+const isCurrentData = (mitreObj) => !mitreObj.revoked && !mitreObj.x_mitre_deprecated;
+
 const extractTacticsData = (mitreData) => {
   const tactics = mitreData
     .filter((obj) => obj.type === 'x-mitre-tactic')
@@ -115,7 +117,8 @@ const extractTechniques = (mitreData) => {
     .filter(
       (obj) =>
         obj.type === 'attack-pattern' &&
-        (obj.x_mitre_is_subtechnique === false || obj.x_mitre_is_subtechnique === undefined)
+        (obj.x_mitre_is_subtechnique === false || obj.x_mitre_is_subtechnique === undefined) &&
+        isCurrentData(obj)
     )
     .reduce((acc, item) => {
       let tactics = [];
@@ -142,7 +145,7 @@ const extractTechniques = (mitreData) => {
 
 const extractSubtechniques = (mitreData) => {
   const subtechniques = mitreData
-    .filter((obj) => obj.x_mitre_is_subtechnique === true)
+    .filter((obj) => obj.x_mitre_is_subtechnique === true && isCurrentData(obj))
     .reduce((acc, item) => {
       let tactics = [];
       const { id, reference } = getIdReference(item.external_references);

diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
diff --git a/...on_engine_api_integration/security_and_spaces/group10/risk_engine/init_and_status_apis.ts b/...on_engine_api_integration/security_and_spaces/group10/risk_engine/init_and_status_apis.ts
@@ -47,7 +47,8 @@ export default ({ getService }: FtrProviderContext) => {
       });
     });
 
-    describe('init api', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/168376
+    describe.skip('init api', () => {
       it('should return response with success status', async () => {
         const response = await riskEngineRoutes.init();
         expect(response.body).to.eql({

diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/elasticsearch.ts b/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/elasticsearch.ts
@@ -32,7 +32,9 @@ export const deleteDataStream = (dataStreamName: string) => {
   });
 };
 
-export const deleteAllDocuments = (target: string) =>
+export const deleteAllDocuments = (target: string) => {
+  refreshIndex(target);
+
   rootRequest({
     method: 'POST',
     url: `${Cypress.env(
@@ -49,6 +51,7 @@ export const deleteAllDocuments = (target: string) =>
       },
     },
   });
+};
 
 export const createIndex = (indexName: string, properties: Record<string, unknown>) =>
   rootRequest({

diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
@@ -44,7 +44,8 @@ export default function ({ getService }: FtrProviderContext) {
   const endpointTestResources = getService('endpointTestResources');
   const log = getService('log');
 
-  describe('test metadata apis', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/151854
+  describe.skip('test metadata apis', () => {
     describe('list endpoints GET route', () => {
       const numberOfHostsInFixture = 2;
       let agent1Timestamp: number;