From ab6a3425c6ac76baa3b2d50a9b2d22eb2ab2b650 Mon Sep 17 00:00:00 2001 From: Amardeepsingh Siglani Date: Wed, 22 Feb 2023 11:51:01 -0800 Subject: [PATCH] Bumped version to 2.6 (#422) * bumped version Signed-off-by: Amardeepsingh Siglani * fixed unit test Signed-off-by: Amardeepsingh Siglani * upgraded yarn version to match OSD Signed-off-by: Amardeepsingh Siglani * fix yarn version Signed-off-by: Amardeepsingh Siglani * reverted version change Signed-off-by: Amardeepsingh Siglani * fixed dashboard message Signed-off-by: Amardeepsingh Siglani * updated workflows Signed-off-by: Amardeepsingh Siglani * updated workflows Signed-off-by: Amardeepsingh Siglani * updated package version Signed-off-by: Amardeepsingh Siglani --------- Signed-off-by: Amardeepsingh Siglani --- .github/workflows/cypress-workflow.yml | 6 ++--- .github/workflows/unit-tests-workflow.yml | 2 +- opensearch_dashboards.json | 4 +-- package.json | 2 +- .../containers/DefineDetector.tsx | 25 +++++++++++-------- .../UpdateAlertConditions.mock.ts | 2 ++ 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 8c66cd8e1..99333d6ce 100644 --- 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 index bdb00ee92..dade61633 100644 --- 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 index ff8dc6529..27b64089b 100644 --- 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 index f5a4c536f..373a4c462 100644 --- 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 index 381087615..474288563 100644 --- 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 - -

- A detector dashboard will be automatically created to provide insights for this - detector. -

- - - + {logTypesWithDashboards.has(detector_type) ? ( + <> + +

+ A detector dashboard will be automatically created to provide insights for this + detector. +

+ + + + + ) : null}