Skip to content

Commit 5154e7a

Browse files
authored
version decoupling support for MDS (#407) (#409)
Signed-off-by: sumukhswamy <[email protected]>
1 parent 2a5ac06 commit 5154e7a

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

opensearch_dashboards.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
"requiredPlugins": [
88
"navigation"
99
],
10-
"optionalPlugins": [
11-
"dataSource",
12-
"dataSourceManagement"
13-
]
10+
"optionalPlugins": ["dataSource","dataSourceManagement"],
11+
"supportedOSDataSourceVersions": ">=2.8.0"
1412
}

public/components/query_compare/home.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import React, { useEffect, useMemo, useState } from 'react';
7-
import { ChromeBreadcrumb, CoreStart, MountPoint, NotificationsStart } from '../../../../../src/core/public';
7+
import { ChromeBreadcrumb, CoreStart, MountPoint, NotificationsStart, SavedObject } from '../../../../../src/core/public';
88
import { DataSourceAggregatedViewConfig, DataSourceManagementPluginSetup } from '../../../../../src/plugins/data_source_management/public';
99
import { NavigationPublicPluginStart } from '../../../../../src/plugins/navigation/public';
1010
import { QUERY_NUMBER_ONE, QUERY_NUMBER_TWO, ServiceEndpoints } from '../../../common';
@@ -15,7 +15,10 @@ import { Flyout } from '../common/flyout';
1515
import { CreateIndex } from './create_index';
1616
import { SearchResult } from './search_result';
1717

18+
import semver from "semver";
19+
import { DataSourceAttributes } from '../../../../../src/plugins/data_source/common/data_sources';
1820
import { DataSourceMenuProps, DataSourceOption } from '../../../../../src/plugins/data_source_management/public/components/data_source_menu/types';
21+
import * as pluginManifest from "../../../opensearch_dashboards.json";
1922
import './home.scss';
2023

2124
interface QueryExplorerProps {
@@ -142,6 +145,14 @@ export const Home = ({
142145
if(dataSourceEnabled){
143146
DataSourceMenu = dataSourceManagement.ui.getDataSourceMenu<DataSourceAggregatedViewConfig>();
144147
}
148+
149+
const dataSourceFilterFn = (dataSource: SavedObject<DataSourceAttributes>) => {
150+
const dataSourceVersion = dataSource?.attributes?.dataSourceVersion || "";
151+
return (
152+
semver.satisfies(dataSourceVersion, pluginManifest.supportedOSDataSourceVersions)
153+
);
154+
};
155+
145156
// Get Indexes and Pipelines
146157
useEffect(() => {
147158

@@ -162,6 +173,7 @@ export const Home = ({
162173
notifications: notifications,
163174
fullWidth: true,
164175
displayAllCompatibleDataSources: true,
176+
dataSourceFilterFn: dataSourceFilterFn
165177
}}
166178
/>
167179
);

0 commit comments

Comments
 (0)