Merge remote-tracking branch 'opensearch/2.10' into backport/backport…

…-752-to-2.10
opensearch-project · Dec 6, 2023 · 422a092 · 422a092
2 parents d5879cd + b802a5a
commit 422a092
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml
@@ -7,8 +7,8 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.x'
-  SECURITY_ANALYTICS_BRANCH: '2.x'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.10.0'
+  SECURITY_ANALYTICS_BRANCH: '2.10'
 jobs:
   tests:
     name: Run Cypress E2E tests
@@ -87,7 +87,7 @@ jobs:
       - name: Run OpenSearch-Dashboards server
         run: |
           cd OpenSearch-Dashboards
-          yarn start --no-base-path --no-watch &
+          yarn start --no-base-path --no-watch --server.host="0.0.0.0" &
         shell: bash
 
       # Window is slow so wait longer

diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml
@@ -7,7 +7,7 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.x'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.10'
 jobs:
   tests:
     name: Run unit tests

diff --git a/cypress/support/helpers.js b/cypress/support/helpers.js
@@ -307,6 +307,8 @@ export const createDetector = (
       });
     });
 
+  // Wait for the first run to execute before ingesting data
+  cy.wait(65000);
   // Ingest documents to the test index
   for (let i = 0; i < indexDocsCount; i++) {
     cy.insertDocumentToIndex(indexName, '', indexDoc);

diff --git a/public/store/CorrelationsStore.ts b/public/store/CorrelationsStore.ts
@@ -268,12 +268,16 @@ export class CorrelationsStore implements ICorrelationsStore {
     );
 
     if (response?.ok) {
-      const correlatedFindings = response.response.findings.map((f) => {
-        return {
-          ...allFindings[f.finding],
-          correlationScore: f.score < 0.01 ? '0.01' : f.score.toFixed(2),
-        };
+      const correlatedFindings: CorrelationFinding[] = [];
+      response.response.findings.forEach((f) => {
+        if (allFindings[f.finding]) {
+          correlatedFindings.push({
+            ...allFindings[f.finding],
+            correlationScore: f.score < 0.01 ? '0.01' : f.score.toFixed(2),
+          });
+        }
       });
+
       return {
         finding: allFindings[finding],
         correlatedFindings,