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

eirsep · 2022-09-27T00:41:00Z

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

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

codecov-commenter · 2022-09-27T02:08:56Z

Codecov Report

Merging #569 (023b325) into 2.x (61f93b4) will decrease coverage by 0.02%.
The diff coverage is 75.00%.

@@             Coverage Diff              @@
##                2.x     #569      +/-   ##
============================================
- Coverage     76.48%   76.46%   -0.03%     
  Complexity      116      116              
============================================
  Files           141      127      -14     
  Lines          6958     6436     -522     
  Branches        973      923      -50     
============================================
- Hits           5322     4921     -401     
+ Misses         1139     1046      -93     
+ Partials        497      469      -28

Impacted Files	Coverage Δ
...ain/kotlin/org/opensearch/alerting/AlertService.kt	`78.67% <ø> (ø)`
...rg/opensearch/alerting/BucketLevelMonitorRunner.kt	`77.44% <ø> (ø)`
.../opensearch/alerting/DocumentLevelMonitorRunner.kt	`81.91% <ø> (ø)`
...in/kotlin/org/opensearch/alerting/MonitorRunner.kt	`63.75% <ø> (ø)`
...in/org/opensearch/alerting/MonitorRunnerService.kt	`79.59% <ø> (ø)`
...org/opensearch/alerting/QueryLevelMonitorRunner.kt	`79.48% <ø> (ø)`
...n/kotlin/org/opensearch/alerting/TriggerService.kt	`73.21% <ø> (ø)`
...search/alerting/action/AcknowledgeAlertResponse.kt	`94.44% <ø> (ø)`
...ensearch/alerting/action/GetDestinationsRequest.kt	`100.00% <ø> (ø)`
...otlin/org/opensearch/alerting/alerts/AlertMover.kt	`65.38% <ø> (ø)`
... and 24 more

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

getsaurabh02

Thanks @eirsep . LGTM, couple of suggestions around testing.

getsaurabh02 · 2022-09-27T17:16:39Z

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetAlertsAction.kt

+     2. alert index mentioned in monitor data sources.
+     3. Default alert indices pattern
+     */
+    suspend fun resolveAlertsIndexName(getAlertsRequest: GetAlertsRequest): String {


Lets add a unit test to verify name resolution

this has been verified in the transport layer integ test in the following scenarios:

Verify get alerts for monitor WITHOUT custom alerts index.

Verify get alerts for monitor WITH custom alerts index and request has monitor ID.

Verify get alerts for monitor WITH custom alerts index and request has custom alerts index.

Verify get alerts with request containing incorrect monitor id

Verify get alerts with request containing non-existent alert index name.

getsaurabh02 · 2022-09-27T17:17:28Z

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetFindingsAction.kt

                } catch (t: Exception) {
                    actionListener.onFailure(AlertingException.wrap(t))
                }
            }
        }
    }

-    suspend fun search(searchSourceBuilder: SearchSourceBuilder): GetFindingsResponse {
+    suspend fun resolveFindingsIndexName(findingsRequest: GetFindingsRequest): String {


same as above - we should verify the name resolution logic via unit test.

same test coverage as detailed for get alerts.

opensearch-trigger-bot · 2022-10-06T23:58:28Z

The backport to main failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-main main
# Navigate to the new working tree
cd .worktrees/backport-main
# Create a new branch
git switch --create backport/backport-569-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 52e945d4f6afa0d5cd085ce1b48a493c8edf5f4e
# Push it to GitHub
git push --set-upstream origin backport/backport-569-to-main
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-main

Then, create a pull request where the base branch is main and the compare/head branch is backport/backport-569-to-main.

* 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>

use findings and alerts models, dtos from common utils

3490892

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

eirsep requested a review from a team September 27, 2022 00:41

update org.opensearch.alerting.txt class path for Alert

023b325

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

eirsep requested a review from sbcd90 September 27, 2022 08:53

getsaurabh02 reviewed Sep 27, 2022

View reviewed changes

getsaurabh02 approved these changes Sep 27, 2022

View reviewed changes

sbcd90 approved these changes Sep 27, 2022

View reviewed changes

eirsep merged commit 52e945d into opensearch-project:2.x Sep 27, 2022

lezzago added the backport main label Oct 6, 2022

eirsep mentioned this pull request Oct 10, 2022

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

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

eirsep commented Sep 27, 2022

codecov-commenter commented Sep 27, 2022 •

edited

Loading

getsaurabh02 left a comment

getsaurabh02 Sep 27, 2022

eirsep Sep 27, 2022 •

edited

Loading

getsaurabh02 Sep 27, 2022

eirsep Sep 27, 2022

opensearch-trigger-bot bot commented Oct 6, 2022

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

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

Conversation

eirsep commented Sep 27, 2022

codecov-commenter commented Sep 27, 2022 • edited Loading

Codecov Report

getsaurabh02 left a comment

Choose a reason for hiding this comment

getsaurabh02 Sep 27, 2022

Choose a reason for hiding this comment

eirsep Sep 27, 2022 • edited Loading

Choose a reason for hiding this comment

getsaurabh02 Sep 27, 2022

Choose a reason for hiding this comment

eirsep Sep 27, 2022

Choose a reason for hiding this comment

opensearch-trigger-bot bot commented Oct 6, 2022

codecov-commenter commented Sep 27, 2022 •

edited

Loading

eirsep Sep 27, 2022 •

edited

Loading