MDS Support for trace analytics #1752

sumukhswamy · 2024-04-29T21:44:51Z

Description

Added MDS Support for trace analytics

Issues Resolved

#1440 [FEATURE] Support Multiple Data Source in Observability Dashboards Plugin

Check List

New functionality includes testing.
- All tests pass, including unit test, integration test and doctest
New functionality has been documented.
- New functionality has javadoc added
- New functionality has user manual doc added
Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: sumukhswamy <[email protected]>

BionIT · 2024-04-29T22:06:39Z

public/components/trace_analytics/components/dashboard/dashboard_content.tsx

@@ -173,6 +171,7 @@ export function DashboardContent(props: DashboardProps) {
        //     setToast!('Query took too long to execute.', 'danger', 'Reduce time range or filter your data. If issue persists, consider increasing your cluster size.');
        //   }
        // },
+        dataSourceMDSId[0].id,


are we certain dataSourceMDSId is non empty array?

BionIT · 2024-04-29T22:07:26Z

public/components/trace_analytics/components/services/service_view.tsx

+      DSL,
+      setFields,
+      mode,
+      props.dataSourceMDSId[0].id


do we check if the array is not empty?

have initialized it to [{id:'',label:''}]

public/components/trace_analytics/components/services/services.tsx

public/components/trace_analytics/components/traces/trace_view.tsx

server/routes/trace_analytics_dsl_router.ts

joshuali925 · 2024-04-29T22:12:15Z

public/components/trace_analytics/components/traces/traces_content.tsx

+            fullWidth: true,
+          }}
+        />
+      )}


there was a DataSourceMenu in home.tsx, why is it needed again here?

there are two menus one is readonly and one is a selector

public/components/trace_analytics/components/services/services_content.tsx

server/routes/trace_analytics_dsl_router.ts

YANG-DB · 2024-04-29T22:26:17Z

Hi @sumukhswamy
can you please explain in more details the overall change you've introduced here

flow changes
query updates
UX changes
Thanks

ykmr1224 · 2024-04-29T22:29:06Z

public/components/trace_analytics/requests/services_request_handler.ts

+  dataSourceMDSId?: string,
  setServiceMap?: any,
-  serviceNameFilter?: string,
+  serviceNameFilter?: string


One suggestion is making those optional parameters an object attribute like:

export const handleServicesRequest = async ( http: HttpSetup, DSL: any, setItems: any, mode: TraceAnalyticsMode, options?: ServicesRequestOptions)

Then we don't need to specify all the parameters from caller, and it would become more clear which parameter is specified. (generally, having more than 4 parameter is not recommended for readability/maintainability especially the same type parameters)

sumukhswamy · 2024-04-29T23:18:19Z

Screen.Recording.2024-04-29.at.4.16.37.PM.mov

Signed-off-by: sumukhswamy <[email protected]>

Signed-off-by: Sumukh Swamy <[email protected]>

opensearch-trigger-bot · 2024-05-01T00:07:28Z

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1752-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 da7d54e6d01bc46ae16db071bfa472b5f828afaa
# Push it to GitHub
git push --set-upstream origin backport/backport-1752-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1752-to-2.x.

opensearch-trigger-bot · 2024-05-01T00:56:14Z

The backport to 2.14 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-observability/backport-2.14 2.14
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.14
# Create a new branch
git switch --create backport/backport-1752-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 da7d54e6d01bc46ae16db071bfa472b5f828afaa
# Push it to GitHub
git push --set-upstream origin backport/backport-1752-to-2.14
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.14

Then, create a pull request where the base branch is 2.14 and the compare/head branch is backport/backport-1752-to-2.14.

* added changes for datasourcemds- ids Signed-off-by: sumukhswamy <[email protected]> * added trace analytics support for MDS Signed-off-by: sumukhswamy <[email protected]> * added trace analytics support for MDS Signed-off-by: sumukhswamy <[email protected]> * added changes Signed-off-by: sumukhswamy <[email protected]> * addressed PR comments Signed-off-by: sumukhswamy <[email protected]> * addressed linter issues Signed-off-by: sumukhswamy <[email protected]> --------- Signed-off-by: sumukhswamy <[email protected]> Signed-off-by: Sumukh Swamy <[email protected]>

* added changes for datasourcemds- ids * added trace analytics support for MDS * added trace analytics support for MDS * added changes * addressed PR comments * addressed linter issues --------- Signed-off-by: sumukhswamy <[email protected]> Signed-off-by: Sumukh Swamy <[email protected]>

This reverts commit da7d54e.

This reverts commit 16ab631.

This reverts commit 07ee729.

sumukhswamy added 2 commits April 29, 2024 11:35

added changes for datasourcemds- ids

4e0a088

Signed-off-by: sumukhswamy <[email protected]>

added trace analytics support for MDS

4df7071

Signed-off-by: sumukhswamy <[email protected]>

sumukhswamy requested review from ps48, kavithacm, derek-ho, joshuali925, dai-chen, YANG-DB, rupal-bq, mengweieric, vamsimanohar, Swiddis, penghuo, seankao-az, anirudha and paulstn as code owners April 29, 2024 21:44

sumukhswamy added 3 commits April 29, 2024 14:45

Merge branch 'main' into mds-traces

a177339

added trace analytics support for MDS

5bc4818

Signed-off-by: sumukhswamy <[email protected]>

added changes

d923a64

Signed-off-by: sumukhswamy <[email protected]>

BionIT reviewed Apr 29, 2024

View reviewed changes

joshuali925 reviewed Apr 29, 2024

View reviewed changes

ykmr1224 reviewed Apr 29, 2024

View reviewed changes

server/routes/trace_analytics_dsl_router.ts Outdated Show resolved Hide resolved

ykmr1224 reviewed Apr 29, 2024

View reviewed changes

server/routes/trace_analytics_dsl_router.ts Outdated Show resolved Hide resolved

ykmr1224 reviewed Apr 29, 2024

View reviewed changes

addressed PR comments

173074d

Signed-off-by: sumukhswamy <[email protected]>

sumukhswamy force-pushed the mds-traces branch from 7c52670 to 173074d Compare April 29, 2024 23:35

joshuali925 approved these changes Apr 30, 2024

View reviewed changes

sumukhswamy added the enhancement New feature or request label Apr 30, 2024

sumukhswamy added the backport 2.x label Apr 30, 2024

addressed linter issues

8a357b8

Signed-off-by: sumukhswamy <[email protected]>

sumukhswamy force-pushed the mds-traces branch from d4dd134 to 8a357b8 Compare April 30, 2024 21:58

sumukhswamy added 2 commits April 30, 2024 15:04

Merge branch 'main' into mds-traces

7bc5258

Signed-off-by: Sumukh Swamy <[email protected]>

Merge branch 'main' into mds-traces

8ae7a97

ps48 approved these changes Apr 30, 2024

View reviewed changes

sumukhswamy merged commit da7d54e into opensearch-project:main May 1, 2024
8 of 19 checks passed

opensearch-trigger-bot bot added the backport-failed label May 1, 2024

sumukhswamy added the backport 2.14 label May 1, 2024

RyanL1997 mentioned this pull request May 1, 2024

[BugFix] Fix S3_DATASOURCE_TYPE naming typo in plugin.tsx #1799

Merged

6 tasks

sumukhswamy added a commit that referenced this pull request May 1, 2024

Revert "MDS Support for trace analytics (#1752)"

f602f6a

This reverts commit da7d54e.

sumukhswamy mentioned this pull request May 1, 2024

Revert "MDS Support for trace analytics" #1800

Closed

sumukhswamy added a commit that referenced this pull request May 1, 2024

Revert "MDS Support for trace analytics (#1752) (#1791)"

089e3a6

This reverts commit 16ab631.

sumukhswamy added a commit that referenced this pull request May 1, 2024

Revert "MDS Support for trace analytics (#1752) (#1790)"

f613029

This reverts commit 07ee729.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MDS Support for trace analytics #1752

MDS Support for trace analytics #1752

sumukhswamy commented Apr 29, 2024 •

edited

Loading

BionIT Apr 29, 2024

BionIT Apr 29, 2024

sumukhswamy Apr 29, 2024

joshuali925 Apr 29, 2024

sumukhswamy Apr 29, 2024

YANG-DB commented Apr 29, 2024

ykmr1224 Apr 29, 2024

sumukhswamy commented Apr 29, 2024

opensearch-trigger-bot bot commented May 1, 2024

opensearch-trigger-bot bot commented May 1, 2024

MDS Support for trace analytics #1752

MDS Support for trace analytics #1752

Conversation

sumukhswamy commented Apr 29, 2024 • edited Loading

Description

Issues Resolved

Check List

BionIT Apr 29, 2024

Choose a reason for hiding this comment

BionIT Apr 29, 2024

Choose a reason for hiding this comment

sumukhswamy Apr 29, 2024

Choose a reason for hiding this comment

joshuali925 Apr 29, 2024

Choose a reason for hiding this comment

sumukhswamy Apr 29, 2024

Choose a reason for hiding this comment

YANG-DB commented Apr 29, 2024

ykmr1224 Apr 29, 2024

Choose a reason for hiding this comment

sumukhswamy commented Apr 29, 2024

opensearch-trigger-bot bot commented May 1, 2024

opensearch-trigger-bot bot commented May 1, 2024

sumukhswamy commented Apr 29, 2024 •

edited

Loading