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

Fix mds ref update on integration assets #2240

Merged
merged 2 commits into from
Nov 4, 2024

Conversation

ps48
Copy link
Member

@ps48 ps48 commented Nov 1, 2024

Description

Fix mds reference update on integration assets

Issues Resolved

Mds reference was not getting added for integrations there were two issues:

  1. The integration builder code was checking the flint source to update the MDS ref.
  2. The data ingestion API call wasn't taking MDS ref as parameter.
integration-mds-ref.mov

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: Shenoy Pratik <sgguruda@amazon.com>
@ps48 ps48 added bug Something isn't working backport 2.x labels Nov 1, 2024
@@ -207,7 +207,7 @@ export class IntegrationInstanceBuilder {
dataSourceMDSId?: string,
dataSourceMDSLabel?: string
): SavedObject[] {
if (!dataSource) {
if (!dataSourceMDSId) {
Copy link
Member

Choose a reason for hiding this comment

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

what's the difference? and is dataSource still used?

Copy link
Member Author

@ps48 ps48 Nov 1, 2024

Choose a reason for hiding this comment

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

Datasource is the flint one. We need to fix the naming soon in whole code-base.

Copy link
Collaborator

@TackAdam TackAdam left a comment

Choose a reason for hiding this comment

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

LGTM tested locally with mds on/off and in workspaces. Index patterns are now created with the correct datasource.

@ps48 ps48 added the mds-2.18.0 label Nov 1, 2024
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Copy link

codecov bot commented Nov 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.26%. Comparing base (61328a9) to head (700a2d9).
Report is 38 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2240      +/-   ##
==========================================
- Coverage   56.58%   56.26%   -0.32%     
==========================================
  Files         389      391       +2     
  Lines       14954    15158     +204     
  Branches     4059     4073      +14     
==========================================
+ Hits         8462     8529      +67     
- Misses       6430     6567     +137     
  Partials       62       62              
Flag Coverage Δ
dashboards-observability 56.26% <100.00%> (-0.32%) ⬇️

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.

@ps48 ps48 merged commit 10e6636 into opensearch-project:main Nov 4, 2024
12 of 20 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 4, 2024
* fix mds ref update on integration assests

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* add unit test for builder with mds enabled

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 10e6636)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ps48 pushed a commit that referenced this pull request Nov 5, 2024
* fix mds ref update on integration assests



* add unit test for builder with mds enabled



---------


(cherry picked from commit 10e6636)

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x bug Something isn't working mds-2.18.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants