Use alerting models and dtos from common-utils dependencies. #592

eirsep · 2022-10-07T23:08:46Z

2.x PRs, whose changes are being applied to main.
#577
#569
#568
#558
#556

This PR also bumps Alerting plugin to 2.4

…#487) * Added 2.1 release notes. Signed-off-by: AWSHurneyt <[email protected]> * Added 2.1 release notes. Signed-off-by: AWSHurneyt <[email protected]> (cherry picked from commit 9f3c393) Co-authored-by: AWSHurneyt <[email protected]>

…ensearch-project#503) * Version increment automation Signed-off-by: pgodithi <[email protected]> * Version increment automation: task rename updateVersion Signed-off-by: pgodithi <[email protected]> (cherry picked from commit 3b8bfe7) Signed-off-by: prudhvigodithi <[email protected]> Co-authored-by: Prudhvi Godithi <[email protected]>

…rch-project#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 <[email protected]> (cherry picked from commit a27d5a2) Signed-off-by: prudhvigodithi <[email protected]> Co-authored-by: Leonidas Spyropoulos <[email protected]>

….1.0.0 zip following deprecation of ODFE. (opensearch-project#510) (opensearch-project#512) Signed-off-by: AWSHurneyt <[email protected]> (cherry picked from commit fea6b4a) Co-authored-by: AWSHurneyt <[email protected]>

…ersion from 4.3.1 to 4.6.1. (opensearch-project#506) Signed-off-by: AWSHurneyt <[email protected]>

* Added 2.2 release notes. Signed-off-by: AWSHurneyt <[email protected]> * Added 2.2 release notes. Signed-off-by: AWSHurneyt <[email protected]>

* Bumped 2.x branch from version 2.2.0 to 2.3.0. Signed-off-by: AWSHurneyt <[email protected]> * Bumped mockito core version. Signed-off-by: AWSHurneyt <[email protected]> Signed-off-by: AWSHurneyt <[email protected]>

…h-project#549) Signed-off-by: Subhobrata Dey <[email protected]>

* Added 2.3 release notes. Signed-off-by: AWSHurneyt <[email protected]> * Added 2.3 release notes. Signed-off-by: AWSHurneyt <[email protected]> Signed-off-by: AWSHurneyt <[email protected]>

…ject#556) Signed-off-by: Subhobrata Dey <[email protected]>

Signed-off-by: Surya Sashank Nistala <[email protected]>

Signed-off-by: Subhobrata Dey <[email protected]>

…oject#569) Signed-off-by: Surya Sashank Nistala <[email protected]>

…roject#570) (opensearch-project#571) Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Peter Zhu <[email protected]> (cherry picked from commit 3a844f8) Co-authored-by: Peter Zhu <[email protected]>

opensearch-project#577) Signed-off-by: Surya Sashank Nistala <[email protected]>

Signed-off-by: Surya Sashank Nistala <[email protected]>

codecov-commenter · 2022-10-08T00:51:35Z

Codecov Report

Merging #592 (6838335) into main (2c7c652) will decrease coverage by 0.66%.
The diff coverage is 64.00%.

@@             Coverage Diff              @@
##               main     #592      +/-   ##
============================================
- Coverage     76.99%   76.32%   -0.67%     
+ Complexity      178      116      -62     
============================================
  Files           167      127      -40     
  Lines          8576     6455    -2121     
  Branches       1270      926     -344     
============================================
- Hits           6603     4927    -1676     
+ Misses         1337     1054     -283     
+ Partials        636      474     -162

Impacted Files	Coverage Δ
...ain/kotlin/org/opensearch/alerting/AlertService.kt	`78.67% <ø> (+0.47%)`	⬆️
...rg/opensearch/alerting/BucketLevelMonitorRunner.kt	`77.44% <ø> (ø)`
.../opensearch/alerting/DocumentLevelMonitorRunner.kt	`81.91% <ø> (ø)`
...ain/kotlin/org/opensearch/alerting/InputService.kt	`94.28% <ø> (ø)`
...org/opensearch/alerting/QueryLevelMonitorRunner.kt	`79.48% <ø> (ø)`
...n/kotlin/org/opensearch/alerting/TriggerService.kt	`73.21% <ø> (ø)`
...search/alerting/action/AcknowledgeAlertResponse.kt	`94.44% <ø> (ø)`
...pensearch/alerting/action/ExecuteMonitorRequest.kt	`100.00% <ø> (ø)`
...ensearch/alerting/action/GetDestinationsRequest.kt	`100.00% <ø> (ø)`
...nsearch/alerting/action/GetEmailAccountResponse.kt	`92.50% <ø> (ø)`
... and 62 more

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

lezzago · 2022-10-08T01:46:15Z

Can we cherry-pick the 2.x commits and make the changes accordingly

lezzago · 2022-10-08T01:47:44Z

Can we reference the 2.x PRs that this is coming from?

eirsep · 2022-10-10T03:49:28Z

Can we reference the 2.x PRs that this is coming from?

@lezzago have updated PR description with the same

qreshi · 2022-10-10T17:37:03Z

build.gradle

@@ -7,10 +7,10 @@ buildscript {
    apply from: 'build-tools/repositories.gradle'

    ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.4.0-SNAPSHOT")


Let's also note in the PR description that we're bumping main to 2.4.0 here if it's necessary for it to be in this PR. Ideally, we should separate it into another PR so it's easier to note when it happened in the commit history at a glance.

It's necessary in this PR. Have updated the description as suggested. thanks for pointing it out.

Cool, spoke with @eirsep and we'll merge in #596 and then this PR.

Signed-off-by: Surya Sashank Nistala <[email protected]>

opensearch-trigger-bot bot and others added 16 commits July 6, 2022 14:42

Bumping 2.x branch version from 2.1.0 to 2.2.0. Bumped mockito-core v…

a66229d

…ersion from 4.3.1 to 4.6.1. (opensearch-project#506) Signed-off-by: AWSHurneyt <[email protected]>

Added 2.2 release notes. (opensearch-project#514)

dd48aae

* Added 2.2 release notes. Signed-off-by: AWSHurneyt <[email protected]> * Added 2.2 release notes. Signed-off-by: AWSHurneyt <[email protected]>

Deprecate the Master nomenclature (opensearch-project#548) (opensearc…

560f7f0

…h-project#549) Signed-off-by: Subhobrata Dey <[email protected]>

Added 2.3 release notes. (opensearch-project#551)

f4a7a41

* Added 2.3 release notes. Signed-off-by: AWSHurneyt <[email protected]> * Added 2.3 release notes. Signed-off-by: AWSHurneyt <[email protected]> Signed-off-by: AWSHurneyt <[email protected]>

moving over data models from alerting to common-utils (opensearch-pro…

f34ee22

…ject#556) Signed-off-by: Subhobrata Dey <[email protected]>

backport monitor datasources to 2.x (opensearch-project#558)

7e812ab

Signed-off-by: Surya Sashank Nistala <[email protected]>

expose delete monitor api from alerting (opensearch-project#568)

61f93b4

Signed-off-by: Subhobrata Dey <[email protected]>

Use findings and alerts models, dtos from common utils (opensearch-pr…

52e945d

…oject#569) Signed-off-by: Surya Sashank Nistala <[email protected]>

Disable ktlint for alerting as it has errors on Windows (opensearch-p…

6c7866d

…roject#570) (opensearch-project#571) Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Peter Zhu <[email protected]> (cherry picked from commit 3a844f8) Co-authored-by: Peter Zhu <[email protected]>

Recreate request object from writeable for Get alerts and get findings (

860d0b7

opensearch-project#577) Signed-off-by: Surya Sashank Nistala <[email protected]>

use common utils models, dtos, actions

6729f69

Signed-off-by: Surya Sashank Nistala <[email protected]>

eirsep requested a review from a team October 7, 2022 23:08

eirsep force-pushed the commons branch from 6729f69 to 1d981d1 Compare October 8, 2022 00:36

eirsep force-pushed the commons branch from 1d981d1 to c6850e4 Compare October 8, 2022 00:58

eirsep requested review from lezzago and sbcd90 October 8, 2022 01:06

sbcd90 approved these changes Oct 8, 2022

View reviewed changes

qreshi reviewed Oct 10, 2022

View reviewed changes

getsaurabh02 approved these changes Oct 10, 2022

View reviewed changes

Use alerting models and dtos from common-utils dependencies

6c2df9d

Signed-off-by: Surya Sashank Nistala <[email protected]>

eirsep force-pushed the commons branch from c6850e4 to 6c2df9d Compare October 10, 2022 18:57

port over datasources alert index usage correctly

6838335

Signed-off-by: Surya Sashank Nistala <[email protected]>

eirsep merged commit 1547560 into opensearch-project:main Oct 10, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use alerting models and dtos from common-utils dependencies. #592

Use alerting models and dtos from common-utils dependencies. #592

eirsep commented Oct 7, 2022 •

edited

Loading

codecov-commenter commented Oct 8, 2022 •

edited

Loading

lezzago commented Oct 8, 2022

lezzago commented Oct 8, 2022

eirsep commented Oct 10, 2022

qreshi Oct 10, 2022

eirsep Oct 10, 2022

qreshi Oct 10, 2022

Use alerting models and dtos from common-utils dependencies. #592

Use alerting models and dtos from common-utils dependencies. #592

Conversation

eirsep commented Oct 7, 2022 • edited Loading

codecov-commenter commented Oct 8, 2022 • edited Loading

Codecov Report

lezzago commented Oct 8, 2022

lezzago commented Oct 8, 2022

eirsep commented Oct 10, 2022

qreshi Oct 10, 2022

Choose a reason for hiding this comment

eirsep Oct 10, 2022

Choose a reason for hiding this comment

qreshi Oct 10, 2022

Choose a reason for hiding this comment

eirsep commented Oct 7, 2022 •

edited

Loading

codecov-commenter commented Oct 8, 2022 •

edited

Loading