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

Merge main to 1.x #183

Merged
merged 26 commits into from
Nov 5, 2021
Merged

Conversation

downsrob
Copy link
Contributor

@downsrob downsrob commented Nov 3, 2021

Description of changes:
Merges main branch to 1.x. The 1.x branch has become out of date, we are merging from main to update it and prepare to cut the 1.2 branch.
CheckList:

  • 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.

peterzhuamazon and others added 24 commits July 9, 2021 17:43
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
…ct#109)

* Explain response still use old opendistro policy id
* Use hardcoded policyid setting in tests for explain response
* Trying to fix flaky tests
…nstalled (opensearch-project#113)

Signed-off-by: Ravi Thaluru <ravi1092@gmail.com>
* Updates NAME of transport actions

* Upgrades Kotlin version, updates dependencies on other OS plugins, adds notification plugin as a test resource and includes it in test clusters

* Adds support for Channels in error notifications and notification actions

* Adds support for sending notifications to channels

* Adds support for publishing notifications to the legacy destinations through the Notification plugin and some cleanup

* Removes notification alerting jar dependency

* Adds compile only dep on commons codec for digest utils sha1 method in ism rollup

* Updates Error Notification to make channel/destination nullable, and adds helper methods for publish calls

* Constructs URL for legacy custom webhook

Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>

* Fixes Feature enum and dep

Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>

* Trying something else

Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>

* Addresses comments

Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>
… on user (opensearch-project#115)

Signed-off-by: Ravi Thaluru <ravi1092@gmail.com>
Signed-off-by: Ravi Thaluru <ravi1092@gmail.com>
Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>
Signed-off-by: Ravi Thaluru <ravi1092@gmail.com>
* Release note for 1.1.0.0 release.

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Correct copyright notices
Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>
* Provide default copyright header using IDE feature

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Address opensearch-project#103

history write index is rolled over even if the history indices are
disabled
Signed-off-by: dblock <dblock@dblock.org>
Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>
* Updates index management version to 1.2

* Updates job scheduler snapshot to 1.2 in test resources

Signed-off-by: Robert Downs <downsrob@amazon.com>
…project#165)

* Adds cluster setting to search all rollup jobs

Signed-off-by: Clay Downs <downsrob@amazon.com>
…project#147)

* Adds delay implementation for rollup jobs

* Removes non-continuous delay implementation

* Adds additional rollup delay tests

Signed-off-by: Clay Downs <downsrob@amazon.com>
…adataRegressionIT tests (opensearch-project#168)

* Updates testCompile mockito version to match OpenSearch changes

* AwaitsFix on the failing MetadataRegressionIT tests

Signed-off-by: Robert Downs <downsrob@amazon.com>
…search-project#153)

* Adds jitter cluster setting, sets jitter to 0 for ISM tests

Signed-off-by: Clay Downs <downsrob@amazon.com>
…pensearch-project#180)

* Allows out of band rollovers on an index without causing ISM to fail

Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>

* Fixes detekt issue

Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>
@downsrob downsrob marked this pull request as ready for review November 3, 2021 23:30
bowenlan-amzn
bowenlan-amzn previously approved these changes Nov 5, 2021
thalurur
thalurur previously approved these changes Nov 5, 2021
@downsrob downsrob dismissed stale reviews from thalurur and bowenlan-amzn via 7e5e92e November 5, 2021 16:56
@codecov-commenter
Copy link

codecov-commenter commented Nov 5, 2021

Codecov Report

Merging #183 (7e5e92e) into 1.x (091fe9f) will decrease coverage by 3.70%.
The diff coverage is 62.63%.

Impacted file tree graph

@@             Coverage Diff              @@
##                1.x     #183      +/-   ##
============================================
- Coverage     78.58%   74.88%   -3.71%     
- Complexity     1895     1901       +6     
============================================
  Files           255      260       +5     
  Lines         10378    11094     +716     
  Branches       1534     1746     +212     
============================================
+ Hits           8156     8308     +152     
- Misses         1374     1853     +479     
- Partials        848      933      +85     
Impacted Files Coverage Δ
...temanagement/opensearchapi/OpenSearchExtensions.kt 76.82% <ø> (-5.78%) ⬇️
...ement/step/notification/AttemptNotificationStep.kt 57.14% <ø> (ø)
...ment/transport/action/addpolicy/AddPolicyAction.kt 50.00% <ø> (-16.67%) ⬇️
...ransport/action/changepolicy/ChangePolicyAction.kt 50.00% <ø> (-16.67%) ⬇️
...ransport/action/deletepolicy/DeletePolicyAction.kt 50.00% <ø> (-16.67%) ⬇️
...nagement/transport/action/explain/ExplainAction.kt 50.00% <ø> (-16.67%) ⬇️
...nt/transport/action/getpolicy/GetPoliciesAction.kt 50.00% <ø> (-16.67%) ⬇️
...ment/transport/action/getpolicy/GetPolicyAction.kt 50.00% <ø> (-16.67%) ⬇️
.../transport/action/indexpolicy/IndexPolicyAction.kt 50.00% <ø> (-16.67%) ⬇️
...ansport/action/managedIndex/ManagedIndexRequest.kt 0.00% <0.00%> (ø)
... and 148 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 091fe9f...7e5e92e. Read the comment docs.

@downsrob downsrob merged commit 19215c2 into opensearch-project:1.x Nov 5, 2021
@downsrob downsrob deleted the merge-main-to-1.x branch November 5, 2021 19:13
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.

8 participants