Increment to 3.1.0.0 (#1301)

* Increment to 3.1.0.0

Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com>

* Upgrade start-opensearch to v6, include jdk-version to use

Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com>

* Bug-Fix: Display alerts when a configured correlation rule is opened

Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com>

---------

Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com>

Author: vikhy-aws

.github/workflows/cypress-workflow.yml

@@ -8,7 +8,7 @@ on:
       - '*'
 env:
   OPENSEARCH_DASHBOARDS_VERSION: 'main'
-  OPENSEARCH_VERSION: '3.0.0-SNAPSHOT'
+  OPENSEARCH_VERSION: '3.1.0-SNAPSHOT'
   SECURITY_ANALYTICS_BRANCH: 'main'
   GRADLE_VERSION: '7.6.1'
 jobs:

.github/workflows/verify-binary-installation.yml

@@ -2,7 +2,7 @@ name: 'Install Dashboards with Plugin via Binary'
 
 on: [push, pull_request]
 env:
-  OPENSEARCH_VERSION: '3.0.0'
+  OPENSEARCH_VERSION: '3.1.0'
   CI: 1
   # avoid warnings like "tput: No value for $TERM and no -T specified"
   TERM: xterm
@@ -20,6 +20,12 @@ jobs:
       - name: Checkout Branch
         uses: actions/checkout@v3
 
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin # Temurin is a distribution of adoptium
+          java-version: 21
+
       - name: Set env
         run: |
           opensearch_version=$(node -p "require('./opensearch_dashboards.json').opensearchDashboardsVersion")
@@ -29,10 +35,11 @@ jobs:
         shell: bash
 
       - name: Run Opensearch
-        uses: derek-ho/start-opensearch@v2
+        uses: derek-ho/start-opensearch@v6
         with:
           opensearch-version: ${{ env.OPENSEARCH_VERSION }}
           security-enabled: false
+          jdk-version: 21
 
       - name: Run Dashboard
         id: setup-dashboards
@@ -52,4 +59,3 @@ jobs:
         run: |
           timeout 300 bash -c 'while [[ "$(curl http://localhost:5601/api/status | jq -r '.status.overall.state')" != "green" ]]; do sleep 5; done'
         shell: bash
-

opensearch_dashboards.json

@@ -1,7 +1,7 @@
 {
   "id": "securityAnalyticsDashboards",
-  "version": "3.0.0.0",
-  "opensearchDashboardsVersion": "3.0.0",
+  "version": "3.1.0.0",
+  "opensearchDashboardsVersion": "3.1.0",
   "configPath": ["opensearch_security_analytics"],
   "requiredPlugins": ["data", "navigation", "opensearchDashboardsUtils", "contentManagement"],
   "optionalPlugins": ["dataSource", "dataSourceManagement"],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opensearch_security_analytics_dashboards",
-  "version": "3.0.0.0",
+  "version": "3.1.0.0",
   "description": "OpenSearch Dashboards plugin for Security Analytics",
   "main": "index.js",
   "license": "Apache-2.0",

public/pages/Correlations/containers/CreateCorrelationRule.tsx

@@ -906,6 +906,12 @@ export const CreateCorrelationRule: React.FC<CreateCorrelationRuleProps> = (
             props.resetForm();
           }
 
+          useEffect(() => {
+            if (trigger?.id) {
+              setShowForm(true);
+            }
+          }, [trigger?.id]);
+
           return (
             <Form>
               <ContentPanel
@@ -1010,15 +1016,17 @@ export const CreateCorrelationRule: React.FC<CreateCorrelationRuleProps> = (
                   <p>Get an alert on the correlation between the findings.</p>
                 </EuiText>
                 <EuiSpacer size="m" />
-                <EuiCompressedFormRow>
-                  <EuiFlexGroup>
-                    <EuiFlexItem grow={false}>
-                      <EuiSmallButton onClick={() => setShowForm(!showForm)}>
-                        Add Alert Trigger
-                      </EuiSmallButton>
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
-                </EuiCompressedFormRow>
+                {!showForm && (
+                  <EuiCompressedFormRow>
+                    <EuiFlexGroup>
+                      <EuiFlexItem grow={false}>
+                        <EuiSmallButton onClick={() => setShowForm(!showForm)}>
+                          Add Alert Trigger
+                        </EuiSmallButton>
+                      </EuiFlexItem>
+                    </EuiFlexGroup>
+                  </EuiCompressedFormRow>
+                )}
                 {showForm && (
                   <>
                     <EuiSpacer size="m" />