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

Bumped 2.x branch from version 2.2.0 to 2.3.0. #547

Merged
merged 2 commits into from
Sep 8, 2022

Conversation

AWSHurneyt
Copy link
Collaborator

Signed-off-by: AWSHurneyt hurneyt@amazon.com

Issue #, if available:
#534

Description of changes:
Bumped 2.x branch from version 2.2.0 to 2.3.0.

CheckList:
[x] 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: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt
Copy link
Collaborator Author

The workflows are failing because the 2.3 notifications zip isn't available. This PR is dependent on opensearch-project/opensearch-build#2581

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt
Copy link
Collaborator Author

The whitesource check references snakeyaml in its failure messages. That failure is caused by the OpenSearch 2.3 zip (as mentioned here, not the alerting plugin. As mentioned here, that issue will be resolved on the OpenSearch side, not alerting.

As a result, the whitesource failure in this PR shouldn't need remediation.

@codecov-commenter
Copy link

codecov-commenter commented Sep 8, 2022

Codecov Report

Merging #547 (4c33018) into 2.x (dd48aae) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##                2.x     #547   +/-   ##
=========================================
  Coverage     76.76%   76.76%           
  Complexity      176      176           
=========================================
  Files           166      166           
  Lines          8370     8370           
  Branches       1232     1232           
=========================================
  Hits           6425     6425           
- Misses         1341     1342    +1     
+ Partials        604      603    -1     
Impacted Files Coverage Δ
...nationmigration/DestinationMigrationCoordinator.kt 63.82% <0.00%> (-4.26%) ⬇️
...destinationmigration/DestinationConversionUtils.kt 70.00% <0.00%> (ø)
...rch/alerting/opensearchapi/OpenSearchExtensions.kt 55.40% <0.00%> (+1.35%) ⬆️
...ing/model/destination/DestinationContextFactory.kt 78.57% <0.00%> (+3.57%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@AWSHurneyt AWSHurneyt marked this pull request as ready for review September 8, 2022 19:49
@AWSHurneyt AWSHurneyt requested a review from a team September 8, 2022 19:49
@khushbr khushbr merged commit c9ab2bf into opensearch-project:2.x Sep 8, 2022
eirsep added a commit that referenced this pull request Oct 10, 2022
* Added 2.1 release notes. (#485) (#487)

* Added 2.1 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.1 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit 9f3c393)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>

* Staging for version increment automation (#489) (#503)

* Version increment automation

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Version increment automation: task rename updateVersion

Signed-off-by: pgodithi <pgodithi@amazon.com>
(cherry picked from commit 3b8bfe7)
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>

Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>

* Add support for reproducible builds (#472) (#499)

As per gradle [docs] add support to remove timestamps and package with same order which is required from
[reproducible] builds

[docs]: https://docs.gradle.org/current/userguide/working_with_files.html#sec:archives
[reproducible]: https://reproducible-builds.org/

Signed-off-by: Leonidas Spyropoulos <artafinde@archlinux.org>
(cherry picked from commit a27d5a2)
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>

Co-authored-by: Leonidas Spyropoulos <artafinde@gmail.com>

* Refactored backwards compatibility tests to point to the OpenSearch 1.1.0.0 zip following deprecation of ODFE. (#510) (#512)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit fea6b4a)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>

* Bumping 2.x branch version from 2.1.0 to 2.2.0. Bumped mockito-core version from 4.3.1 to 4.6.1. (#506)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.2 release notes. (#514)

* Added 2.2 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.2 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Bumped 2.x branch from version 2.2.0 to 2.3.0. (#547)

* Bumped 2.x branch from version 2.2.0 to 2.3.0.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Bumped mockito core version.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Deprecate the Master nomenclature (#548) (#549)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>

* Added 2.3 release notes. (#551)

* Added 2.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* moving over data models from alerting to common-utils (#556)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>

* backport monitor datasources to 2.x (#558)

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* expose delete monitor api from alerting (#568)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>

* Use findings and alerts models, dtos from common utils (#569)

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* Disable ktlint for alerting as it has errors on Windows (#570) (#571)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 3a844f8)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>

* Recreate request object from writeable for Get alerts and get findings (#577)

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* Use alerting models and dtos from common-utils dependencies

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* port over datasources alert index usage correctly

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>
Co-authored-by: Leonidas Spyropoulos <artafinde@gmail.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants