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

Backporting changes to 2.0 #420

Merged
merged 12 commits into from
Apr 21, 2022
Merged

Conversation

AWSHurneyt
Copy link
Collaborator

Issue #, if available:

Description of changes:
Backporting changes to 2.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.

@codecov-commenter
Copy link

codecov-commenter commented Apr 21, 2022

Codecov Report

Merging #420 (7615448) into 2.0 (214c9db) will increase coverage by 0.15%.
The diff coverage is 78.23%.

@@             Coverage Diff              @@
##                2.0     #420      +/-   ##
============================================
+ Coverage     76.84%   77.00%   +0.15%     
  Complexity      177      177              
============================================
  Files           165      165              
  Lines          8142     8203      +61     
  Branches       1191     1205      +14     
============================================
+ Hits           6257     6317      +60     
+ Misses         1297     1291       -6     
- Partials        588      595       +7     
Impacted Files Coverage Δ
...org/opensearch/alerting/core/model/ScheduledJob.kt 78.57% <ø> (ø)
...in/kotlin/org/opensearch/alerting/model/Monitor.kt 88.50% <50.00%> (+0.64%) ⬆️
.../alerting/transport/TransportIndexMonitorAction.kt 67.16% <75.00%> (+0.49%) ⬆️
...opensearch/alerting/util/DocLevelMonitorQueries.kt 79.68% <75.00%> (-7.82%) ⬇️
...nsearch/alerting/DocumentReturningMonitorRunner.kt 84.51% <75.80%> (+1.85%) ⬆️
...n/kotlin/org/opensearch/alerting/AlertingPlugin.kt 93.46% <100.00%> (ø)
...arch/alerting/resthandler/RestGetFindingsAction.kt 100.00% <100.00%> (ø)
...lerting/transport/TransportExecuteMonitorAction.kt 67.94% <100.00%> (ø)
...h/alerting/transport/TransportGetFindingsAction.kt 90.00% <100.00%> (+0.95%) ⬆️
...nationmigration/DestinationMigrationCoordinator.kt 63.82% <100.00%> (-0.46%) ⬇️
... and 9 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 214c9db...7615448. Read the comment docs.

sbcd90 and others added 10 commits April 21, 2022 09:43
Signed-off-by: Subhobrata Dey <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
* Rebase to push doc level changes on latest main changes (opensearch-project#391)

* Document level alerting dev (opensearch-project#272)

Signed-off-by: Ashish Agrawal <[email protected]>

* Add last run context to Monitor data model

Signed-off-by: Ashish Agrawal <[email protected]>

* add Update Monitor function

Signed-off-by: Ashish Agrawal <[email protected]>

* fix integ test

Signed-off-by: Ashish Agrawal <[email protected]>

* Implemented draft of Finding data model, a new Input type, and some basic unit tests. (opensearch-project#260)

* Implemented draft of Finding data model, and some basic unit tests for it.

Signed-off-by: AWSHurneyt <[email protected]>

* POC for doc-level-alerting (opensearch-project#277)

Signed-off-by: Sriram <[email protected]>

* Add connection to triggers for doc level alerting (opensearch-project#316)

Signed-off-by: Ashish Agrawal <[email protected]>

* CRUD APIs integration Tests and validation"conflict resolved" (opensearch-project#362)

Signed-off-by: charliezhangaws <[email protected]>

* Segregate monitor runner logic for separation of concerns (opensearch-project#363)

* Refactor monitor runner logic for separation of concerns and better testability.

Signed-off-by: Saurabh Singh <[email protected]>

* Add action and alert flow and findings schema and additional fixes (opensearch-project#381)

Signed-off-by: Ashish Agrawal <[email protected]>

* Finding Search API (opensearch-project#385)

* Findings search API based on Annie's work

Signed-off-by: Annie Lee <[email protected]>

* Fix Search API and add IT tests

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: Annie Lee <[email protected]>

* Fix integ tests and minor issues from doc level changes

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Daniel Doubrovkine (dB.) <[email protected]>
Co-authored-by: AWSHurneyt <[email protected]>
Co-authored-by: Sriram <[email protected]>
Co-authored-by: charliezhangaws <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Annie Lee <[email protected]>

* Add Trigger condition resolver which parses and evaluates the Trigger expression. (opensearch-project#405)

Signed-off-by: Saurabh Singh <[email protected]>

* percolate query implementation in doc-level alerting (opensearch-project#399)

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

* Finding Index rollover (opensearch-project#408)

* Finding Index rollover

Signed-off-by: jiahe zhang <[email protected]>

* Apply fixes to make rollover work

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: jiahe zhang <[email protected]>

Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Daniel Doubrovkine (dB.) <[email protected]>
Co-authored-by: AWSHurneyt <[email protected]>
Co-authored-by: Sriram <[email protected]>
Co-authored-by: charliezhangaws <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Subhobrata Dey <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
* Remove write Destination API REST handlers

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove write Destination transport actions

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove write Destination action, request and response classes

Signed-off-by: Mohammad Qureshi <[email protected]>

* Create Alerting config index if it doesn't exist before legacy Destination indexing

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove write Destination related security tests

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove unused access roles and imports

Signed-off-by: Mohammad Qureshi <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
* Remove notification subproject

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove publishing to maven in build script

Signed-off-by: Mohammad Qureshi <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
* Implemented support for defining doc level monitors using aliases.

Signed-off-by: AWSHurneyt <[email protected]>

* Fix integ tests and cleaup alias logic

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: AWSHurneyt <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
…earch-project#411)

* Replace checked-in ZIP with a dynamic dependency

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

* Replace checked-in ZIP with a dynamic dependency

Signed-off-by: Subhobrata Dey <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
@AWSHurneyt AWSHurneyt merged commit 0effecf into opensearch-project:2.0 Apr 21, 2022
Angie-Zhang pushed a commit to Angie-Zhang/alerting that referenced this pull request Jun 29, 2022
* fix security test workflow (opensearch-project#407)

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

* Integrate Document Level Alerting changes (opensearch-project#410)

* Rebase to push doc level changes on latest main changes (opensearch-project#391)

* Document level alerting dev (opensearch-project#272)

Signed-off-by: Ashish Agrawal <[email protected]>

* Add last run context to Monitor data model

Signed-off-by: Ashish Agrawal <[email protected]>

* add Update Monitor function

Signed-off-by: Ashish Agrawal <[email protected]>

* fix integ test

Signed-off-by: Ashish Agrawal <[email protected]>

* Implemented draft of Finding data model, a new Input type, and some basic unit tests. (opensearch-project#260)

* Implemented draft of Finding data model, and some basic unit tests for it.

Signed-off-by: AWSHurneyt <[email protected]>

* POC for doc-level-alerting (opensearch-project#277)

Signed-off-by: Sriram <[email protected]>

* Add connection to triggers for doc level alerting (opensearch-project#316)

Signed-off-by: Ashish Agrawal <[email protected]>

* CRUD APIs integration Tests and validation"conflict resolved" (opensearch-project#362)

Signed-off-by: charliezhangaws <[email protected]>

* Segregate monitor runner logic for separation of concerns (opensearch-project#363)

* Refactor monitor runner logic for separation of concerns and better testability.

Signed-off-by: Saurabh Singh <[email protected]>

* Add action and alert flow and findings schema and additional fixes (opensearch-project#381)

Signed-off-by: Ashish Agrawal <[email protected]>

* Finding Search API (opensearch-project#385)

* Findings search API based on Annie's work

Signed-off-by: Annie Lee <[email protected]>

* Fix Search API and add IT tests

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: Annie Lee <[email protected]>

* Fix integ tests and minor issues from doc level changes

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Daniel Doubrovkine (dB.) <[email protected]>
Co-authored-by: AWSHurneyt <[email protected]>
Co-authored-by: Sriram <[email protected]>
Co-authored-by: charliezhangaws <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Annie Lee <[email protected]>

* Add Trigger condition resolver which parses and evaluates the Trigger expression. (opensearch-project#405)

Signed-off-by: Saurabh Singh <[email protected]>

* percolate query implementation in doc-level alerting (opensearch-project#399)

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

* Finding Index rollover (opensearch-project#408)

* Finding Index rollover

Signed-off-by: jiahe zhang <[email protected]>

* Apply fixes to make rollover work

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: jiahe zhang <[email protected]>

Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Daniel Doubrovkine (dB.) <[email protected]>
Co-authored-by: AWSHurneyt <[email protected]>
Co-authored-by: Sriram <[email protected]>
Co-authored-by: charliezhangaws <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Subhobrata Dey <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>

* Remove write Destination APIs (opensearch-project#412)

* Remove write Destination API REST handlers

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove write Destination transport actions

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove write Destination action, request and response classes

Signed-off-by: Mohammad Qureshi <[email protected]>

* Create Alerting config index if it doesn't exist before legacy Destination indexing

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove write Destination related security tests

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove unused access roles and imports

Signed-off-by: Mohammad Qureshi <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>

* Deprecate the Master nomenclature in 2.0 (opensearch-project#415)

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

* Remove Alerting's notification subproject (opensearch-project#413)

* Remove notification subproject

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove publishing to maven in build script

Signed-off-by: Mohammad Qureshi <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>

* Skipping destination migration if alerting index is not initialized (opensearch-project#417)

Signed-off-by: Ravi [email protected]
Signed-off-by: AWSHurneyt <[email protected]>

* Alias support for Document Level Monitors (opensearch-project#416)

* Implemented support for defining doc level monitors using aliases.

Signed-off-by: AWSHurneyt <[email protected]>

* Fix integ tests and cleaup alias logic

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: AWSHurneyt <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>

* Fixed a flaky test condition. (opensearch-project#375)

Signed-off-by: AWSHurneyt <[email protected]>

* Replace checked-in ZIP for bwc tests with a dynamic dependency (opensearch-project#411)

* Replace checked-in ZIP with a dynamic dependency

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

* Replace checked-in ZIP with a dynamic dependency

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

* Update integTest gradle scripts to run via remote cluster independently (opensearch-project#418)

Signed-off-by: AWSHurneyt <[email protected]>

* Removed tests that were duplicated while resolving merge conflicts.

Signed-off-by: AWSHurneyt <[email protected]>

Co-authored-by: Subhobrata Dey <[email protected]>
Co-authored-by: Ashish Agrawal <[email protected]>
Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Daniel Doubrovkine (dB.) <[email protected]>
Co-authored-by: Sriram <[email protected]>
Co-authored-by: charliezhangaws <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Mohammad Qureshi <[email protected]>
Co-authored-by: Ravi <[email protected]>
Signed-off-by: Angie Zhang <[email protected]>
Angie-Zhang pushed a commit to Angie-Zhang/alerting that referenced this pull request Jun 29, 2022
* fix security test workflow (opensearch-project#407)

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

* Integrate Document Level Alerting changes (opensearch-project#410)

* Rebase to push doc level changes on latest main changes (opensearch-project#391)

* Document level alerting dev (opensearch-project#272)

Signed-off-by: Ashish Agrawal <[email protected]>

* Add last run context to Monitor data model

Signed-off-by: Ashish Agrawal <[email protected]>

* add Update Monitor function

Signed-off-by: Ashish Agrawal <[email protected]>

* fix integ test

Signed-off-by: Ashish Agrawal <[email protected]>

* Implemented draft of Finding data model, a new Input type, and some basic unit tests. (opensearch-project#260)

* Implemented draft of Finding data model, and some basic unit tests for it.

Signed-off-by: AWSHurneyt <[email protected]>

* POC for doc-level-alerting (opensearch-project#277)

Signed-off-by: Sriram <[email protected]>

* Add connection to triggers for doc level alerting (opensearch-project#316)

Signed-off-by: Ashish Agrawal <[email protected]>

* CRUD APIs integration Tests and validation"conflict resolved" (opensearch-project#362)

Signed-off-by: charliezhangaws <[email protected]>

* Segregate monitor runner logic for separation of concerns (opensearch-project#363)

* Refactor monitor runner logic for separation of concerns and better testability.

Signed-off-by: Saurabh Singh <[email protected]>

* Add action and alert flow and findings schema and additional fixes (opensearch-project#381)

Signed-off-by: Ashish Agrawal <[email protected]>

* Finding Search API (opensearch-project#385)

* Findings search API based on Annie's work

Signed-off-by: Annie Lee <[email protected]>

* Fix Search API and add IT tests

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: Annie Lee <[email protected]>

* Fix integ tests and minor issues from doc level changes

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Daniel Doubrovkine (dB.) <[email protected]>
Co-authored-by: AWSHurneyt <[email protected]>
Co-authored-by: Sriram <[email protected]>
Co-authored-by: charliezhangaws <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Annie Lee <[email protected]>

* Add Trigger condition resolver which parses and evaluates the Trigger expression. (opensearch-project#405)

Signed-off-by: Saurabh Singh <[email protected]>

* percolate query implementation in doc-level alerting (opensearch-project#399)

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

* Finding Index rollover (opensearch-project#408)

* Finding Index rollover

Signed-off-by: jiahe zhang <[email protected]>

* Apply fixes to make rollover work

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: jiahe zhang <[email protected]>

Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Daniel Doubrovkine (dB.) <[email protected]>
Co-authored-by: AWSHurneyt <[email protected]>
Co-authored-by: Sriram <[email protected]>
Co-authored-by: charliezhangaws <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Subhobrata Dey <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>

* Remove write Destination APIs (opensearch-project#412)

* Remove write Destination API REST handlers

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove write Destination transport actions

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove write Destination action, request and response classes

Signed-off-by: Mohammad Qureshi <[email protected]>

* Create Alerting config index if it doesn't exist before legacy Destination indexing

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove write Destination related security tests

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove unused access roles and imports

Signed-off-by: Mohammad Qureshi <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>

* Deprecate the Master nomenclature in 2.0 (opensearch-project#415)

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

* Remove Alerting's notification subproject (opensearch-project#413)

* Remove notification subproject

Signed-off-by: Mohammad Qureshi <[email protected]>

* Remove publishing to maven in build script

Signed-off-by: Mohammad Qureshi <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>

* Skipping destination migration if alerting index is not initialized (opensearch-project#417)

Signed-off-by: Ravi [email protected]
Signed-off-by: AWSHurneyt <[email protected]>

* Alias support for Document Level Monitors (opensearch-project#416)

* Implemented support for defining doc level monitors using aliases.

Signed-off-by: AWSHurneyt <[email protected]>

* Fix integ tests and cleaup alias logic

Signed-off-by: Ashish Agrawal <[email protected]>

Co-authored-by: AWSHurneyt <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>

* Fixed a flaky test condition. (opensearch-project#375)

Signed-off-by: AWSHurneyt <[email protected]>

* Replace checked-in ZIP for bwc tests with a dynamic dependency (opensearch-project#411)

* Replace checked-in ZIP with a dynamic dependency

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

* Replace checked-in ZIP with a dynamic dependency

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

* Update integTest gradle scripts to run via remote cluster independently (opensearch-project#418)

Signed-off-by: AWSHurneyt <[email protected]>

* Removed tests that were duplicated while resolving merge conflicts.

Signed-off-by: AWSHurneyt <[email protected]>

Co-authored-by: Subhobrata Dey <[email protected]>
Co-authored-by: Ashish Agrawal <[email protected]>
Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Daniel Doubrovkine (dB.) <[email protected]>
Co-authored-by: Sriram <[email protected]>
Co-authored-by: charliezhangaws <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Annie Lee <[email protected]>
Co-authored-by: Saurabh Singh <[email protected]>
Co-authored-by: Mohammad Qureshi <[email protected]>
Co-authored-by: Ravi <[email protected]>
Signed-off-by: Angie Zhang <[email protected]>
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.

7 participants