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

[Bug] Trace Analytics bug fix for local cluster being rendered #2006

Merged
merged 3 commits into from
Jul 29, 2024

Conversation

sumukhswamy
Copy link
Collaborator

@sumukhswamy sumukhswamy commented Jul 29, 2024

Description

#1878 - trace analytics

App analytics page crash for missing MDS-id #1931

Issues Resolved

#1878

#1931

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>
opensearch_dashboards.json Outdated Show resolved Hide resolved
Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
@ps48
Copy link
Member

ps48 commented Jul 29, 2024

let's update the snapshots here.

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
@sumukhswamy sumukhswamy merged commit 5da577f into opensearch-project:main Jul 29, 2024
9 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-2006-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5da577f4d253636a10cf99e1f14e53acac2c2170
# Push it to GitHub
git push --set-upstream origin backport/backport-2006-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-2006-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.16 failed:

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

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.16 2.16
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.16
# Create a new branch
git switch --create backport/backport-2006-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5da577f4d253636a10cf99e1f14e53acac2c2170
# Push it to GitHub
git push --set-upstream origin backport/backport-2006-to-2.16
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.16

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

sumukhswamy added a commit to sumukhswamy/dashboards-observability that referenced this pull request Jul 29, 2024
…earch-project#2006)

* traces and app analytics fix

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

* reverted json file

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

* updated snapshots

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

---------

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
sumukhswamy added a commit to sumukhswamy/dashboards-observability that referenced this pull request Jul 29, 2024
…earch-project#2006)

* traces and app analytics fix

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

* reverted json file

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

* updated snapshots

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

---------

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
ps48 added a commit that referenced this pull request Jul 30, 2024
…red (#2006) (#2009)

* [Bug] Trace Analytics bug fix for local cluster being rendered (#2006)

* traces and app analytics fix

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

* reverted json file

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

* updated snapshots

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

---------

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

* updated snapshots

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

* updated snapshot changes from core

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

---------

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
sumukhswamy added a commit that referenced this pull request Jul 30, 2024
#2008)

* traces and app analytics fix



* reverted json file



* updated snapshots



---------

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

3 participants