[MDS] Add support for register data sources during the absence of local cluster #2140
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -169,6 +169,7 @@ export class ObservabilityPlugin | |
| constructor(initializerContext: PluginInitializerContext) { | ||
| this.config = initializerContext.config.get<PublicConfig>(); | ||
| } | ||
| private featureFlagStatus: boolean = false; | ||
|
|
||
| public setup( | ||
| core: CoreSetup<AppPluginStartDependencies>, | ||
|
|
@@ -184,6 +185,7 @@ export class ObservabilityPlugin | |
| }); | ||
|
|
||
| setupOverviewPage(setupDeps.contentManagement!); | ||
| this.featureFlagStatus = !!setupDeps.dataSource; | ||
|
|
||
| // redirect legacy notebooks URL to current URL under observability | ||
| if (window.location.pathname.includes('notebooks-dashboards')) { | ||
|
|
@@ -459,55 +461,57 @@ export class ObservabilityPlugin | |
| return `${type.charAt(0).toUpperCase()}${type.slice(1)}`; | ||
| }; | ||
|
|
||
| // register all s3 datasources only if mds feature flag is disabled | ||
| if (!this.featureFlagStatus) { | ||
|
There was a problem hiding this comment. can we directly use There was a problem hiding this comment. we can't access the There was a problem hiding this comment. got it. this makes sense for now. Ideally with should stop the registration at setup itself. Adding if condition here: https://github.com/opensearch-project/dashboards-observability/blob/3ad2bf0448f6a705f449f42e62be8398f840ea37/public/plugin.tsx#L264C11-L264C31 |
||
| const registerDataSources = () => { | ||
| try { | ||
| core.http.get(`${DATACONNECTIONS_BASE}`).then((s3DataSources) => { | ||
| s3DataSources.map((s3ds) => { | ||
| dataSourceService.registerDataSource( | ||
| dataSourceFactory.getDataSourceInstance(S3_DATA_SOURCE_TYPE, { | ||
| id: htmlIdGenerator(OBS_S3_DATA_SOURCE)(), | ||
| name: s3ds.name, | ||
| type: s3ds.connector.toLowerCase(), | ||
| metadata: { | ||
| ...s3ds.properties, | ||
| ui: { | ||
| label: s3ds.name, | ||
| typeLabel: getDataSourceTypeLabel(s3ds.connector.toLowerCase()), | ||
| groupType: s3ds.connector.toLowerCase(), | ||
| selector: { | ||
| displayDatasetsAsSource: false, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| ); | ||
| }); | ||
| }); | ||
| } catch (error) { | ||
| console.error('Error registering S3 datasources', error); | ||
| } | ||
| }; | ||
|
|
||
| dataSourceService.registerDataSourceFetchers([ | ||
| { type: S3_DATA_SOURCE_TYPE, registerDataSources }, | ||
| ]); | ||
|
|
||
| if (startDeps.securityDashboards) { | ||
| core.http | ||
| .get(SECURITY_PLUGIN_ACCOUNT_API) | ||
| .then(() => { | ||
| registerDataSources(); | ||
| }) | ||
| .catch((e) => { | ||
| if (e?.response?.status !== 401) { | ||
| // accounts api should not return any error status other than 401 if security installed, | ||
| // this datasource register is included just in case | ||
| registerDataSources(); | ||
| } | ||
| }); | ||
| } else { | ||
| registerDataSources(); | ||
| } | ||
| } | ||
|
|
||
| core.http.intercept({ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can this variable naming be more explicit? looking at
featureFlagStatusit's hard to tell what the features is..There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes I will change that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the backport is failing, I will manually change it in 2.x first and backport. I will push another commit for change it on main.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have updated here #2144.