Bumped version to 2.6 (#422)

* bumped version Signed-off-by: Amardeepsingh Siglani <[email protected]> * fixed unit test Signed-off-by: Amardeepsingh Siglani <[email protected]> * upgraded yarn version to match OSD Signed-off-by: Amardeepsingh Siglani <[email protected]> * fix yarn version Signed-off-by: Amardeepsingh Siglani <[email protected]> * reverted version change Signed-off-by: Amardeepsingh Siglani <[email protected]> * fixed dashboard message Signed-off-by: Amardeepsingh Siglani <[email protected]> * updated workflows Signed-off-by: Amardeepsingh Siglani <[email protected]> * updated workflows Signed-off-by: Amardeepsingh Siglani <[email protected]> * updated package version Signed-off-by: Amardeepsingh Siglani <[email protected]> --------- Signed-off-by: Amardeepsingh Siglani <[email protected]>
opensearch-project · Feb 22, 2023 · ab6a342 · ab6a342
1 parent 6609322
commit ab6a342
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 17 deletions.
diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml
@@ -7,9 +7,9 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.5.0'
-  OPENSEARCH_VERSION: '2.5.0-SNAPSHOT'
-  SECURITY_ANALYTICS_BRANCH: '2.5'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.6'
+  OPENSEARCH_VERSION: '2.6.0-SNAPSHOT'
+  SECURITY_ANALYTICS_BRANCH: '2.6'
 jobs:
   tests:
     name: Run Cypress E2E tests

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.5.0'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.6'
 jobs:
   tests:
     name: Run unit tests

diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "securityAnalyticsDashboards",
-  "version": "2.5.0.0",
-  "opensearchDashboardsVersion": "2.5.0",
+  "version": "2.6.0.0",
+  "opensearchDashboardsVersion": "2.6.0",
   "configPath": ["opensearch_security_analytics"],
   "requiredPlugins": ["data"],
   "server": true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opensearch_security_analytics_dashboards",
-  "version": "2.5.0.0",
+  "version": "2.6.0.0",
   "description": "OpenSearch Dashboards plugin for Security Analytics",
   "main": "index.js",
   "license": "Apache-2.0",

diff --git a/public/pages/CreateDetector/components/DefineDetector/containers/DefineDetector.tsx b/public/pages/CreateDetector/components/DefineDetector/containers/DefineDetector.tsx
@@ -22,6 +22,7 @@ import {
 } from '../components/DetectionRules/DetectionRules';
 import { NotificationsStart } from 'opensearch-dashboards/public';
 import _ from 'lodash';
+import { logTypesWithDashboards } from '../../../../../utils/constants';
 
 interface DefineDetectorProps extends RouteComponentProps {
   detector: Detector;
@@ -219,16 +220,20 @@ export default class DefineDetector extends Component<DefineDetectorProps, Defin
 
         <EuiSpacer size={'m'} />
 
-        <EuiCallOut
-          title={'Detector dashboard will be created to visualize insights for this detector'}
-        >
-          <p>
-            A detector dashboard will be automatically created to provide insights for this
-            detector.
-          </p>
-        </EuiCallOut>
-
-        <EuiSpacer size={'m'} />
+        {logTypesWithDashboards.has(detector_type) ? (
+          <>
+            <EuiCallOut
+              title={'Detector dashboard will be created to visualize insights for this detector'}
+            >
+              <p>
+                A detector dashboard will be automatically created to provide insights for this
+                detector.
+              </p>
+            </EuiCallOut>
+
+            <EuiSpacer size={'m'} />
+          </>
+        ) : null}
 
         <DetectorSchedule
           detector={detector}

diff --git a/test/mocks/Detectors/components/UpdateAlertConditions/UpdateAlertConditions.mock.ts b/test/mocks/Detectors/components/UpdateAlertConditions/UpdateAlertConditions.mock.ts
@@ -7,6 +7,7 @@ import services from '../../../services';
 import detectorHitMock from '../../containers/Detectors/DetectorHit.mock';
 import notificationsStartMock from '../../../services/notifications/NotificationsStart.mock';
 import UpdateAlertConditions from '../../../../../public/pages/Detectors/components/UpdateAlertConditions/UpdateAlertConditions';
+import { ROUTES } from '../../../../../public/utils/constants';
 
 const { notificationsService, detectorService, openSearchService, ruleService } = services;
 
@@ -18,6 +19,7 @@ export default ({
   notificationsService: notificationsService,
   notifications: notificationsStartMock,
   location: {
+    pathname: `${ROUTES.EDIT_DETECTOR_ALERT_TRIGGERS}/${detectorHitMock._id}`,
     state: {
       detectorHit: detectorHitMock,
     },