-
Notifications
You must be signed in to change notification settings - Fork 73
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
[backport to 2.x] rebase main #1180
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 2.x #1180 +/- ##
============================================
+ Coverage 79.71% 80.69% +0.98%
- Complexity 4363 4609 +246
============================================
Files 309 336 +27
Lines 18182 19091 +909
Branches 1909 1987 +78
============================================
+ Hits 14493 15406 +913
+ Misses 2778 2743 -35
- Partials 911 942 +31
Flags with carried forward coverage won't be shown. Click here to find out more.
|
a08c54e
to
a7225a8
Compare
Signed-off-by: Kaituo Li <[email protected]>
Signed-off-by: Kaituo Li <[email protected]>
@@ -57,6 +55,7 @@ jobs: | |||
then | |||
echo "FROM opensearchstaging/opensearch:$docker_version" >> Dockerfile | |||
echo "RUN if [ -d /usr/share/opensearch/plugins/opensearch-anomaly-detection ]; then /usr/share/opensearch/bin/opensearch-plugin remove opensearch-anomaly-detection; fi" >> Dockerfile | |||
echo "RUN if [ -d /usr/share/opensearch/plugins/opensearch-time-series-analytics ]; then /usr/share/opensearch/bin/opensearch-plugin remove opensearch-time-series-analytics; fi" >> Dockerfile |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This implies a plugin name change that I imagine could have lots of other impacts, like infra builds / scripts or frontend plugin builds / scripts that rely on this. We should consider this a breaking change I don't believe we want in 2.x, lmk what you think.
I also see lots of changes related to cluster settings and REST APIs. Could you confirm those are all internal facing and nothing changes from an external/naming perspective? If the latter, same concern as above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should consider this a breaking change I don't believe we want in 2.x, lmk what you think.
I have already synced with infra team and will work with them after 2.13 release.
Could you confirm those are all internal facing and nothing changes from an external/naming perspective?
Those are internal facing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good. Let's call out the only change is related to the plugin name, rest of the functionality remains the same. Sounds like infra will be handled, can you handle tracking of changes on frontend plugin CIs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Thanks for all of the details. This will indeed make development on main and backporting -> 2.x simpler with all of the refactoring changes now included in 2.x :)
Description
This PR rebases the current branch onto the latest version of
main
. This integration brings in all the recent refactoring changes from themain
branch, making it easier to release new enhancements.Note the PR includes f0ed43b where we renamed the plugin name from opendistro_anomaly_detector to opensearch_time_series_analytics.
This PR aligns the 2.x branch with its existing dependencies and reverts breaking changes in OpenSearch 3.0, ensuring smooth continuation of development and release processes in 2.x.
org.apache.hc.core5
toorg.apache.http
to align with libraries present in 2.x.BaseNodeRequest
instead of migrating toTransportRequest
, maintaining 2.x consistency.In ODFERestTestCase
2.x won't throw ParseException during deserialzing XContent. Thus, I removed unnecessary
ParseException
declarations in test casesMaintained version 1.3 in
.github/labeler.yml
Testing Summary:
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.