From 8369a3d84b6c3f2d00ba83d1c20c721fbfad891e Mon Sep 17 00:00:00 2001 From: Songkan Tang Date: Sat, 21 Sep 2024 02:40:26 +0800 Subject: [PATCH] Fix assistant plugin override issue and return dataSourceId in context (#1102) Signed-off-by: Songkan Tang --- opensearch_dashboards.json | 3 +-- public/pages/Dashboard/utils/tableUtils.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 12c57b35..9067bda7 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -3,7 +3,7 @@ "version": "3.0.0.0", "opensearchDashboardsVersion": "3.0.0", "configPath": ["opensearch_alerting"], - "optionalPlugins": ["dataSource", "dataSourceManagement"], + "optionalPlugins": ["dataSource", "dataSourceManagement", "assistantDashboards"], "requiredPlugins": [ "uiActions", "dashboard", @@ -17,7 +17,6 @@ "opensearchDashboardsUtils", "contentManagement" ], - "optionalPlugins": ["assistantDashboards"], "server": true, "ui": true, "supportedOSDataSourceVersions": ">=2.13.0", diff --git a/public/pages/Dashboard/utils/tableUtils.js b/public/pages/Dashboard/utils/tableUtils.js index 9959af14..cb5ef97f 100644 --- a/public/pages/Dashboard/utils/tableUtils.js +++ b/public/pages/Dashboard/utils/tableUtils.js @@ -235,6 +235,7 @@ export const alertColumns = ( dsl: dsl, index: index, }, + dataSourceId: dataSourceQuery?.query?.dataSourceId, }; };