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

Rebase new commits from opendistro repo #5

Merged
merged 6 commits into from
Apr 23, 2021
Merged

Rebase new commits from opendistro repo #5

merged 6 commits into from
Apr 23, 2021

Conversation

joshuali925
Copy link
Member

@joshuali925 joshuali925 commented Apr 22, 2021

Description

cherry picked:
opendistro-for-elasticsearch/trace-analytics#33
opendistro-for-elasticsearch/trace-analytics#34
opendistro-for-elasticsearch/trace-analytics#35
opendistro-for-elasticsearch/trace-analytics#37

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.

wrijeff and others added 5 commits April 22, 2021 11:32
…ds compatibility."

This reverts commit 0c09b5fa3c44ef0957884b0ec3cd1cf6e216ef5d.
Renamed 'traceGroup' to 'traceGroupFields' to support backwards compa…
Fixed getTracesQuery, was returning 0 unexpectedly.
* Add null check for service map query

* Loop through filters when switching percentile filters

* Add check before changing percentile filter
* Revert "Add null check for service map, fix percentile filter (#35)"

This reverts commit 126c3dbd7e25edd33f6b26aa842ae0fc4167e73a.

* Revert "Merge pull request #34 from wrijeff/main"

This reverts commit 66a9dcc9bddd7c8dbb6955e1472448e4ed9bd222, reversing
changes made to 1cfd7b00227be5bd9cc2d2213297e66f0a213dc8.

* Revert "Merge pull request #33 from wrijeff/main"

This reverts commit 1cfd7b00227be5bd9cc2d2213297e66f0a213dc8, reversing
changes made to e9141628e96c2a80cd3123daf320275b51aad243.

* pick: Merge pull request #34 from wrijeff/main

Fixed getTracesQuery, was returning 0 unexpectedly.

* Add null check for service map, fix percentile filter (#35)

* Add null check for service map query

* Loop through filters when switching percentile filters

* Add check before changing percentile filter

* Change to traceGroup

Co-authored-by: Jeff Wright <[email protected]>
@wrijeff
Copy link
Contributor

wrijeff commented Apr 23, 2021

@joshuali925: I've pulled down these changes and am testing with the OpenSearch/Dashboards built artifacts, but I'm still seeing TypeError: Cannot read property 'targetServices' of undefined. Could you try testing as well in case I missed something?

@joshuali925
Copy link
Member Author

@joshuali925: I've pulled down these changes and am testing with the OpenSearch/Dashboards built artifacts, but I'm still seeing TypeError: Cannot read property 'targetServices' of undefined. Could you try testing as well in case I missed something?

@wrijeff I'm not seeing errors on my end. Which branch are you using? this PR branch (pick-odfe) should not be able to run in Dashboards until #4 is merged

Copy link
Contributor

@wrijeff wrijeff left a comment

Choose a reason for hiding this comment

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

I might've pulled the wrong code, will test again using the main branch once this is merged.

@joshuali925 joshuali925 merged commit 55e2e1f into main Apr 23, 2021
@joshuali925 joshuali925 deleted the pick-odfe branch April 23, 2021 23:33
joshuali925 added a commit that referenced this pull request Sep 1, 2021
* Bump to 7.10

* Add github actions

* Refactor

* Add release notes for ODFE 1.12

* Use env in github actions

* Remove target in plugin helpers config

* Update readme

* Add doc link
joshuali925 added a commit to joshuali925/observability that referenced this pull request Sep 8, 2021
)

* Add nav bar

* Rename elasticsearch to opensearch in gradle pkgbuild

* Remove unnecessary files

* Change es to opensearch
shankha-das pushed a commit to shankha-das/observability that referenced this pull request Jun 24, 2022
…ew-data-config-panel-ui-787

Feature/new data config panel UI 787
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants