MDS Version Decoupling (#806) (#807)

opensearch-trigger-bot[bot] · jackiehanyang · web-flow · commit 826e7b834b3f · 2024-07-16T10:41:05.000-07:00
* update snapshot Signed-off-by: Jackie Han <jkhanjob@gmail.com> * DMS version decoupling Signed-off-by: Jackie Han <jkhanjob@gmail.com> * update AD supported version range for mds version decoupling Signed-off-by: Jackie Han <jkhanjob@gmail.com> --------- Signed-off-by: Jackie Han <jkhanjob@gmail.com> (cherry picked from commit 7e6cdfd) Co-authored-by: Jackie Han <jkhanjob@gmail.com>
diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
@@ -23,5 +23,7 @@
     "opensearchDashboardsUtils"
   ],
   "server": true,
-  "ui": true
+  "ui": true,
+  "supportedOSDataSourceVersions": ">=2.9.0",
+  "requiredOSDataSourcePlugins": ["opensearch-anomaly-detection"]
 }
diff --git a/public/pages/ConfigureModel/containers/ConfigureModel.tsx b/public/pages/ConfigureModel/containers/ConfigureModel.tsx
@@ -61,6 +61,7 @@ import { getErrorMessage } from '../../../utils/utils';
 import {
   constructHrefWithDataSourceId,
   getDataSourceFromURL,
+  isDataSourceCompatible,
 } from '../../../pages/utils/helpers';
 import {
   getDataSourceManagementPlugin,
@@ -270,6 +271,7 @@ export function ConfigureModel(props: ConfigureModelProps) {
           fullWidth: false,
           savedObjects: getSavedObjectsClient(),
           notifications: getNotifications(),
+          dataSourceFilter: isDataSourceCompatible,
         }}
       />
     );
diff --git a/public/pages/Dashboard/Container/DashboardOverview.tsx b/public/pages/Dashboard/Container/DashboardOverview.tsx
@@ -43,6 +43,7 @@ import {
   getAllDetectorsQueryParamsWithDataSourceId,
   getDataSourceFromURL,
   getVisibleOptions,
+  isDataSourceCompatible,
 } from '../../utils/helpers';
 import { BREADCRUMBS, MDS_BREADCRUMBS } from '../../../utils/constants';
 import { DETECTOR_STATE } from '../../../../server/utils/constants';
@@ -285,6 +286,7 @@ export function DashboardOverview(props: OverviewProps) {
             notifications: getNotifications(),
             onSelectedDataSources: (dataSources) =>
               handleDataSourceChange(dataSources),
+            dataSourceFilter: isDataSourceCompatible,
           }}
         />
       );
diff --git a/public/pages/DefineDetector/containers/DefineDetector.tsx b/public/pages/DefineDetector/containers/DefineDetector.tsx
@@ -66,6 +66,7 @@ import { DataSourceSelectableConfig, DataSourceViewConfig } from '../../../../..
 import {
   constructHrefWithDataSourceId,
   getDataSourceFromURL,
+  isDataSourceCompatible,
 } from '../../../pages/utils/helpers';
 import queryString from 'querystring';
 
@@ -308,6 +309,7 @@ export const DefineDetector = (props: DefineDetectorProps) => {
           fullWidth: false,
           savedObjects: getSavedObjectsClient(),
           notifications: getNotifications(),
+          dataSourceFilter: isDataSourceCompatible,
         }}
       />
     );
@@ -328,6 +330,7 @@ export const DefineDetector = (props: DefineDetectorProps) => {
               notifications: getNotifications(),
               onSelectedDataSources: (dataSources) =>
                 handleDataSourceChange(dataSources),
+              dataSourceFilter: isDataSourceCompatible,
             }}
           />
         );
diff --git a/public/pages/DetectorDetail/containers/DetectorDetail.tsx b/public/pages/DetectorDetail/containers/DetectorDetail.tsx
@@ -71,7 +71,7 @@ import {
   getNotifications,
   getSavedObjectsClient,
 } from '../../../services';
-import { constructHrefWithDataSourceId, getDataSourceFromURL } from '../../../pages/utils/helpers';
+import { constructHrefWithDataSourceId, getDataSourceFromURL, isDataSourceCompatible } from '../../../pages/utils/helpers';
 
 export interface DetectorRouterProps {
   detectorId?: string;
@@ -430,6 +430,7 @@ export const DetectorDetail = (props: DetectorDetailProps) => {
           fullWidth: false,
           savedObjects: getSavedObjectsClient(),
           notifications: getNotifications(),
+          dataSourceFilter: isDataSourceCompatible,
         }}
       />
     );
diff --git a/public/pages/DetectorJobs/containers/DetectorJobs.tsx b/public/pages/DetectorJobs/containers/DetectorJobs.tsx
@@ -36,6 +36,7 @@ import { RouteComponentProps, useLocation } from 'react-router-dom';
 import {
   constructHrefWithDataSourceId,
   getDataSourceFromURL,
+  isDataSourceCompatible,
 } from '../../../pages/utils/helpers';
 import {
   getDataSourceManagementPlugin,
@@ -140,6 +141,7 @@ export function DetectorJobs(props: DetectorJobsProps) {
           fullWidth: false,
           savedObjects: getSavedObjectsClient(),
           notifications: getNotifications(),
+          dataSourceFilter: isDataSourceCompatible,
         }}
       />
     );
diff --git a/public/pages/DetectorsList/containers/List/List.tsx b/public/pages/DetectorsList/containers/List/List.tsx
@@ -48,6 +48,7 @@ import {
   constructHrefWithDataSourceId,
   getAllDetectorsQueryParamsWithDataSourceId,
   getVisibleOptions,
+  isDataSourceCompatible,
   sanitizeSearchText,
 } from '../../../utils/helpers';
 import { EmptyDetectorMessage } from '../../components/EmptyMessage/EmptyMessage';
@@ -705,6 +706,7 @@ export const DetectorList = (props: ListProps) => {
             notifications: getNotifications(),
             onSelectedDataSources: (dataSources) =>
               handleDataSourceChange(dataSources),
+            dataSourceFilter: isDataSourceCompatible,
           }}
         />
       );
diff --git a/public/pages/Overview/containers/AnomalyDetectionOverview.tsx b/public/pages/Overview/containers/AnomalyDetectionOverview.tsx
@@ -65,7 +65,7 @@ import {
 } from '../../../../public/services';
 import { RouteComponentProps } from 'react-router-dom';
 import queryString from 'querystring';
-import { getDataSourceFromURL, getSampleDetectorsQueryParamsWithDataSouceId } from '../../../../public/pages/utils/helpers';
+import { getDataSourceFromURL, getSampleDetectorsQueryParamsWithDataSouceId, isDataSourceCompatible } from '../../../../public/pages/utils/helpers';
 import { MDSStates } from '../../../models/interfaces';
 
 interface AnomalyDetectionOverviewProps extends RouteComponentProps {
@@ -258,6 +258,7 @@ export function AnomalyDetectionOverview(props: AnomalyDetectionOverviewProps) {
             notifications: getNotifications(),
             onSelectedDataSources: (dataSources) =>
               handleDataSourceChange(dataSources),
+            dataSourceFilter: isDataSourceCompatible,
           }}
         />
       );
diff --git a/public/pages/ReviewAndCreate/containers/ReviewAndCreate.tsx b/public/pages/ReviewAndCreate/containers/ReviewAndCreate.tsx
@@ -56,6 +56,7 @@ import {
 import {
   constructHrefWithDataSourceId,
   getDataSourceFromURL,
+  isDataSourceCompatible,
 } from '../../../pages/utils/helpers';
 import {
   getDataSourceManagementPlugin,
@@ -310,6 +311,7 @@ export function ReviewAndCreate(props: ReviewAndCreateProps) {
           fullWidth: false,
           savedObjects: getSavedObjectsClient(),
           notifications: getNotifications(),
+          dataSourceFilter: isDataSourceCompatible,
         }}
       />
     );
diff --git a/public/pages/utils/helpers.ts b/public/pages/utils/helpers.ts
@@ -21,6 +21,10 @@ import { ALL_INDICES, ALL_DETECTOR_STATES, MAX_DETECTORS, DEFAULT_QUERY_PARAMS }
 import { DETECTOR_STATE } from '../../../server/utils/constants';
 import { timeFormatter } from '@elastic/charts';
 import { getDataSourceEnabled, getDataSourcePlugin } from '../../services';
+import { DataSourceAttributes } from '../../../../../src/plugins/data_source/common/data_sources';
+import { SavedObject } from '../../../../../src/core/public';
+import * as pluginManifest from "../../../opensearch_dashboards.json";
+import semver from "semver";
 
 export function sanitizeSearchText(searchValue: string): string {
   if (!searchValue || searchValue == '*') {
@@ -184,3 +188,26 @@ export const constructHrefWithDataSourceId = (
 
   return `${basePath}?${url.toString()}`;
 };
+
+export const isDataSourceCompatible = (dataSource: SavedObject<DataSourceAttributes>) => {
+  if (
+    'requiredOSDataSourcePlugins' in pluginManifest &&
+    !pluginManifest.requiredOSDataSourcePlugins.every((plugin) =>
+      dataSource.attributes.installedPlugins?.includes(plugin)
+    )
+  ) {
+    return false;
+  }
+
+  // filter out data sources which is NOT in the support range of plugin
+  if (
+    'supportedOSDataSourceVersions' in pluginManifest &&
+    !semver.satisfies(
+      dataSource.attributes.dataSourceVersion,
+      pluginManifest.supportedOSDataSourceVersions
+    )
+  ) {
+    return false;
+  }
+  return true;
+};
diff --git a/tsconfig.json b/tsconfig.json
@@ -31,6 +31,8 @@
     "allowSyntheticDefaultImports": true,
     // Emits __importStar and __importDefault helpers for runtime babel ecosystem compatibility.
     "esModuleInterop": true,
+    // Allow importing JSON files as modules.
+    "resolveJsonModule": true,
     // Resolve modules in the same way as Node.js. Aka make `require` works the
     // same in TypeScript as it does in Node.js.
     "moduleResolution": "node",
diff --git a/yarn.lock b/yarn.lock
@@ -425,6 +425,11 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
+color-name@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -489,6 +494,11 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+cssfontparser@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz#f4022fc8f9700c68029d542084afbaf425a3f3e3"
+  integrity sha512-6tun4LoZnj7VN6YeegOVb67KBX/7JJsqvj+pv3ZA7F878/eN33AbGa5b/S/wXxS/tcp8nc40xRUrsPlxIyNUPg==
+
 csstype@^3.0.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
@@ -964,6 +974,14 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+jest-canvas-mock@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.5.2.tgz#7e21ebd75e05ab41c890497f6ba8a77f915d2ad6"
+  integrity sha512-vgnpPupjOL6+L5oJXzxTxFrlGEIbHdZqFU+LFNdtLxZ3lRDCl17FlTMM7IatoRQkrcyOTMlDinjUguqmQ6bR2A==
+  dependencies:
+    cssfontparser "^1.2.1"
+    moo-color "^1.0.2"
+
 joi@^17.7.0:
   version "17.9.2"
   resolved "https://registry.yarnpkg.com/joi/-/joi-17.9.2.tgz#8b2e4724188369f55451aebd1d0b1d9482470690"
@@ -1202,6 +1220,13 @@ moment@^2.24.0:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
+moo-color@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/moo-color/-/moo-color-1.0.3.tgz#d56435f8359c8284d83ac58016df7427febece74"
+  integrity sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==
+  dependencies:
+    color-name "^1.1.4"
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,7 @@`
`23`	`23`	`"opensearchDashboardsUtils"`
`24`	`24`	`],`
`25`	`25`	`"server": true,`
`26`		`- "ui": true`
	`26`	`+ "ui": true,`
	`27`	`+ "supportedOSDataSourceVersions": ">=2.9.0",`
	`28`	`+ "requiredOSDataSourcePlugins": ["opensearch-anomaly-detection"]`
`27`	`29`	`}`