Skip to content

[Backport 3.3] MDS support for live queries page #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2025
+14 −8
Merged

[Backport 3.3] MDS support for live queries page #419

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da3aa0a
MDS Live Queries Support (#403)
github-actions[bot] Oct 20, 2025
1b4c0e7
Merge branch '3.3' into backport/backport-403-to-3.3
ansjcy Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions server/routes/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,16 +434,22 @@ export function defineRoutes(router: IRouter, dataSourceEnabled: boolean) {
wlmGroupId?: string;
};

const client =
!dataSourceEnabled || !dataSourceId
? context.queryInsights_plugin.queryInsightsClient.asScoped(request).callAsCurrentUser
: context.dataSource.opensearch.legacy.getClient(dataSourceId);

// Call the appropriate API based on whether wlm_group is provided
const hasGroup = typeof wlmGroup === 'string' && wlmGroup.trim().length > 0;
const res = hasGroup
? await client('queryInsights.getLiveQueriesWLMGroup', { wlmGroupId: wlmGroup })
: await client('queryInsights.getLiveQueries');
let res;

if (!dataSourceEnabled || !dataSourceId) {
const client = context.queryInsights_plugin.queryInsightsClient.asScoped(request)
.callAsCurrentUser;
res = hasGroup
? await client('queryInsights.getLiveQueriesWLMGroup', { wlmGroupId: wlmGroup })
: await client('queryInsights.getLiveQueries');
} else {
const client = context.dataSource.opensearch.legacy.getClient(dataSourceId);
res = hasGroup
? await client.callAPI('queryInsights.getLiveQueriesWLMGroup', { wlmGroupId: wlmGroup })
: await client.callAPI('queryInsights.getLiveQueries', {});
}

if (!res || res.ok === false) {
throw new Error(res?.error || 'Query Insights service returned an error');
Expand Down
Loading