Skip to content
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.

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

added supoort for metrics MDS #1876

Merged
merged 6 commits into from
Jun 8, 2024

Conversation

sumukhswamy
Copy link
Collaborator

@sumukhswamy sumukhswamy commented Jun 5, 2024

Description

With multiple data source enabled, users of OpenSearch Dashboards with Metrics analytics are able to fetch metrics from local and remote clusters
MDS support for metrics analytics
#1754

Issues Resolved

[List any issues this PR will resolve]

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 <sumukhhs@amazon.com>
Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
Copy link

codecov bot commented Jun 6, 2024

Codecov Report

Attention: Patch coverage is 80.64516% with 6 lines in your changes missing coverage. Please review.

Project coverage is 55.64%. Comparing base (c3ab50f) to head (f6ac686).
Report is 6 commits behind head on main.

Current head f6ac686 differs from pull request most recent head eb335b3

Please upload reports for the commit eb335b3 to get more accurate results.

Files Patch % Lines
...c/components/metrics/redux/slices/metrics_slice.ts 80.95% 4 Missing ⚠️
public/components/metrics/sidebar/sidebar.tsx 75.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1876      +/-   ##
==========================================
- Coverage   57.85%   55.64%   -2.21%     
==========================================
  Files         372      386      +14     
  Lines       14081    14789     +708     
  Branches     3712     3926     +214     
==========================================
+ Hits         8146     8229      +83     
- Misses       5871     6485     +614     
- Partials       64       75      +11     
Flag Coverage Δ
dashboards-observability 55.64% <80.64%> (-2.21%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
@sumukhswamy
Copy link
Collaborator Author

Screen.Recording.2024-06-07.at.10.26.14.AM.mov

@sumukhswamy
Copy link
Collaborator Author

Screenshot 2024-06-07 at 10 39 48 AM Screenshot 2024-06-07 at 10 40 35 AM

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
);

const dataSourceMDSId = request.params.dataSourceMDSId;
let opensearchNotebooksClient;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit. Not sure if this should be named notebooks client

@@ -19,11 +19,15 @@ export default class PPLService {
query: string;
format: string;
},
dataSourceMDSId?: string,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed with @sumukhswamy offline this isn't being used by metrics analytics.

@sumukhswamy sumukhswamy merged commit b370404 into opensearch-project:main Jun 8, 2024
14 of 19 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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-1876-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b37040461710c75924ac7f300f11591bdd538a88
# Push it to GitHub
git push --set-upstream origin backport/backport-1876-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-1876-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants