From 46baf0c49c6447f661d8001f6814a8272f4bfe46 Mon Sep 17 00:00:00 2001 From: Nishanth Vinjam Date: Tue, 2 Sep 2025 18:01:04 +0000 Subject: [PATCH 1/4] Moving Data Importer to Data Administration under settings Signed-off-by: Nishanth Vinjam --- src/plugins/data_importer/common/constants.ts | 4 +++- src/plugins/data_importer/public/plugin.ts | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/plugins/data_importer/common/constants.ts b/src/plugins/data_importer/common/constants.ts index 4f6e6fe8806b..f3a20d477fe9 100644 --- a/src/plugins/data_importer/common/constants.ts +++ b/src/plugins/data_importer/common/constants.ts @@ -3,7 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -export const PLUGIN_NAME_AS_TITLE = 'Data Importer'; +export const PLUGIN_NAME_AS_TITLE = 'Import Data'; +export const PLUGIN_DESCRIPTION = + 'Import data from files (CSV, JSON, NDJSON) into OpenSearch indexes.'; export const PLUGIN_ID = 'dataImporter'; export const PLUGIN_NAME = 'dataImporter'; diff --git a/src/plugins/data_importer/public/plugin.ts b/src/plugins/data_importer/public/plugin.ts index f5ac48e16eaa..c6bc0faa92e9 100644 --- a/src/plugins/data_importer/public/plugin.ts +++ b/src/plugins/data_importer/public/plugin.ts @@ -7,8 +7,11 @@ import { AppMountParameters, CoreSetup, CoreStart, + DEFAULT_APP_CATEGORIES, + DEFAULT_NAV_GROUPS, Plugin, PluginInitializerContext, + WorkspaceAvailability, } from '../../../core/public'; import { DataImporterPluginSetup, @@ -16,7 +19,7 @@ import { DataImporterPluginStart, DataImporterPluginStartDependencies, } from './types'; -import { PLUGIN_ID, PLUGIN_NAME_AS_TITLE } from '../common'; +import { PLUGIN_ID, PLUGIN_DESCRIPTION, PLUGIN_NAME_AS_TITLE } from '../common'; import { ConfigSchema } from '../config'; export class DataImporterPlugin @@ -34,6 +37,8 @@ export class DataImporterPlugin core.application.register({ id: PLUGIN_ID, title: PLUGIN_NAME_AS_TITLE, + description: PLUGIN_DESCRIPTION, + workspaceAvailability: WorkspaceAvailability.outsideWorkspace, async mount(params: AppMountParameters) { // Load application bundle const { renderApp } = await import('./application'); @@ -50,6 +55,14 @@ export class DataImporterPlugin }, }); + core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.dataAdministration, [ + { + id: PLUGIN_ID, + category: DEFAULT_APP_CATEGORIES.manageData, + order: 450, + }, + ]); + return {}; } From 913f152e068653fd34deb84051366f0ae3827f85 Mon Sep 17 00:00:00 2001 From: "opensearch-changeset-bot[bot]" <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Date: Tue, 2 Sep 2025 18:33:28 +0000 Subject: [PATCH 2/4] Changeset file for PR #10478 created/updated --- changelogs/fragments/10478.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/10478.yml diff --git a/changelogs/fragments/10478.yml b/changelogs/fragments/10478.yml new file mode 100644 index 000000000000..52d84acc64bc --- /dev/null +++ b/changelogs/fragments/10478.yml @@ -0,0 +1,2 @@ +fix: +- Move the Data Importer plugin to Data Administration under settings ([#10478](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/10478)) \ No newline at end of file From 9de887bfba09af4292be17d1c1d9a6f240805e5c Mon Sep 17 00:00:00 2001 From: Nishanth Vinjam Date: Tue, 28 Oct 2025 17:35:24 +0000 Subject: [PATCH 3/4] Updated the version check logic during start of OSD server --- src/core/server/plugins/discovery/plugin_manifest_parser.ts | 6 +++--- src/core/server/plugins/discovery/plugins_discovery.test.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/server/plugins/discovery/plugin_manifest_parser.ts b/src/core/server/plugins/discovery/plugin_manifest_parser.ts index e5d61f5b26a7..99404b10273c 100644 --- a/src/core/server/plugins/discovery/plugin_manifest_parser.ts +++ b/src/core/server/plugins/discovery/plugin_manifest_parser.ts @@ -292,9 +292,9 @@ function isVersionCompatible( return false; } - return semver.eq( - coercedActualOpenSearchDashboardsVersion, - coercedExpectedOpenSearchDashboardsVersion + return ( + coercedActualOpenSearchDashboardsVersion.major === + coercedExpectedOpenSearchDashboardsVersion.major ); } /** diff --git a/src/core/server/plugins/discovery/plugins_discovery.test.ts b/src/core/server/plugins/discovery/plugins_discovery.test.ts index 191864a76d44..0173160e334f 100644 --- a/src/core/server/plugins/discovery/plugins_discovery.test.ts +++ b/src/core/server/plugins/discovery/plugins_discovery.test.ts @@ -53,7 +53,7 @@ const Plugins = { 'opensearch_dashboards.json': JSON.stringify({ version: '1' }), }), incompatible: () => ({ - 'opensearch_dashboards.json': JSON.stringify({ id: 'plugin', version: '1' }), + 'opensearch_dashboards.json': JSON.stringify({ id: 'plugin', version: '2.0.0' }), }), missingManifest: () => ({}), inaccessibleManifest: () => ({ From 1b912a5878df070e92c14d6f1123a1146c0c3f12 Mon Sep 17 00:00:00 2001 From: "opensearch-changeset-bot[bot]" <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 17:43:33 +0000 Subject: [PATCH 4/4] Changeset file for PR #10818 created/updated --- changelogs/fragments/10818.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/10818.yml diff --git a/changelogs/fragments/10818.yml b/changelogs/fragments/10818.yml new file mode 100644 index 000000000000..c5da6d8ae8f7 --- /dev/null +++ b/changelogs/fragments/10818.yml @@ -0,0 +1,2 @@ +fix: +- Update the version check logic ([#10818](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/10818)) \ No newline at end of file