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.

Sign up for GitHub

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

Jump to bottom

Fixed a bug that was preventing the AcknowledgeAlerts API from acknowledging more than 10 alerts at once. #205

Merged
merged 12 commits into from
Oct 15, 2021
Merged

Fixed a bug that was preventing the AcknowledgeAlerts API from acknowledging more than 10 alerts at once. #205

merged 12 commits into from
Oct 15, 2021

Conversation

AWSHurneyt
Copy link
Collaborator

Issue #, if available:

  1. [BUG] Cannot acknowledge more than 10 alerts at once. #203
  2. Alerting-Dashboard-Plugin PR #126

Description of changes:

  1. Fixed a bug that was preventing the AcknowledgeAlerts API from acknowledging more than 10 alerts at once. Because TransportAcknowledgeAlertAction::findActiveAlerts wasn't using the number of provided alerts for its size, the search API call was using the default size of 10.

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.

AWSHurneyt and others added 8 commits June 30, 2021 23:06
@AWSHurneyt
Added release notes for OpenSearch 1.0.0.0. (opensearch-project#123)
a14ccd4
@adityaj1107 @AWSHurneyt
@peterzhuamazon @lezzago @dblock @qreshi @rishabhmaurya @skkosuri-amzn
Merge commits from the main branch to the 1.x branch. (opensearch-pro…
af5b6c5 
…ject#133)

* Added release notes for OpenSearch 1.0.0.0. (opensearch-project#123) (opensearch-project#124)

Co-authored-by: AWSHurneyt <79280347+AWSHurneyt@users.noreply.github.com>

* Add Integtest.sh for OpenSearch integtest setups (opensearch-project#121)

* Add integtest script to the repo

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

* Add Alerting specific security param for integTest

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

* Remove default assignee (opensearch-project#127)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Removing All Usages of Action Get Method Calls and adding the listeners (opensearch-project#130)

Signed-off-by: Aditya Jindal <aditjind@amazon.com>

* Fix snapshot build and increment to 1.1.0. (opensearch-project#142)

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

* Refactor MonitorRunner (opensearch-project#143)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update Bucket-Level Alerting RFC (opensearch-project#145)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Add BucketSelector pipeline aggregation extension (opensearch-project#144)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

Co-authored-by: Rishabh Maurya <rishabhmaurya05@gmail.com>

* Add AggregationResultBucket (opensearch-project#148)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

Co-authored-by: Rishabh Maurya <rishabhmaurya05@gmail.com>

* Add ActionExecutionPolicy (opensearch-project#149)

* Add ActionExecutionPolicy

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Throw exception if there is an invalid field in PER_ALERT config when parsing

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Don't allow throttle to be configured for PerExecutionActionScope at the data class level since it is not supported yet

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Refactor Monitor and Trigger to split into Query-Level and Bucket-Lev… (opensearch-project#150)

* Refactor Monitor and Trigger to split into Query-Level and Bucket-Level Monitors

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Require condition to not be null when parsing Bucket-Level Trigger

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update InputService for Bucket-Level Alerting (opensearch-project#152)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

Co-authored-by: Rishabh Maurya <rishabhmaurya05@gmail.com>

* Update TriggerService for Bucket-Level Alerting (opensearch-project#153)

* Update TriggerService for Bucket-Level Alerting

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Remove client from TriggerService

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update AlertService for Bucket-Level Alerting (opensearch-project#154)

* Update AlertService for Bucket-Level Alerting

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Move Alert search size for Bucket-Level Monitors to a const

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Add worksheets to help with testing (opensearch-project#151)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update MonitorRunner for Bucket-Level Alerting (opensearch-project#155)

* Update MonitorRunner for Bucket-Level Alerting

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update regressed comment in MonitorRunnerIT

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Add TODO to break down runBucketLevelMonitor method in MonitorRunner

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Fix ktlint formatting issues (opensearch-project#156)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Execute Actions on runTrigger exceptions for Bucket-Level Monitor (opensearch-project#157)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Skip execution of Actions on ACKNOWLEDGED Alerts for Bucket-Level Monitors (opensearch-project#158)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Return first page of input results in MonitorRunResult for Bucket-Level Monitor (opensearch-project#159)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Add setting to limit per alert action executions and don't save Alerts for test Bucket-Level Monitors (opensearch-project#161)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Fix bug in paginating multiple bucket paths for Bucket-Level Monitor (opensearch-project#163)

* Fix bug in paginating multiple bucket paths for Bucket-Level Monitor

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Change trigger after key conditionals to when statement

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Various bug fixes pertaining to throttling on PER_ALERT, saving COMPLETED Alerts and rewriting input query for Bucket-Level Monitors (opensearch-project#164)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Return only monitors for /monitors/_search. (opensearch-project#162)

* Return only monitors for /monitors/_search.

* Added missing imports

* Added additional check to the unit test

* Resolve default for ActionExecutionPolicy at runtime (opensearch-project#165)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

Co-authored-by: AWSHurneyt <79280347+AWSHurneyt@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>
Co-authored-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com>
Co-authored-by: Rishabh Maurya <rishabhmaurya05@gmail.com>
Co-authored-by: Sriram <59816283+skkosuri-amzn@users.noreply.github.com>
@qreshi
Add release notes for 1.1.0.0 release (opensearch-project#166) (opens…
e6b5d34 
…earch-project#167)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>
@dblock
Remove default integtest.sh. (opensearch-project#181)
05eb22e 
Signed-off-by: dblock <dblock@dblock.org>
@skkosuri-amzn
Add valid search filters. (opensearch-project#191)
3a8b874 
* Add valid search filters.

* Added this fix to release notes
@dblock
Publish notification JARs checksums. (opensearch-project#197)
0e9ae1f 
Signed-off-by: dblock <dblock@dblock.org>
@dblock
Also publish SHA 256 and 512 checksums. (opensearch-project#198)
ff7c1c9 
* Also publish SHA 256 and 512 checksums.

Signed-off-by: dblock <dblock@dblock.org>

* Remove sonatype staging.

Signed-off-by: dblock <dblock@dblock.org>
@AWSHurneyt
Fixed a bug that was preventing the AcknowledgeAlerts API from acknow…
07073ad 
…ledging more than 10 alerts at once. Signed-off-by: Thomas Hurney <hurneyt@amazon.com>
@skkosuri-amzn
Copy link
Contributor

Could you pls add test case for this change,

@AWSHurneyt
Implemented integration tests to ensure fix for issue 203 is working …
9235edd 
…as expected. Signed-off-by: Thomas Hurney <hurneyt@amazon.com>
@AWSHurneyt
Copy link
Collaborator Author

Could you pls add test case for this change,

Added a few integration tests to MonitorRestApiIT to test the functionality.

@qreshi
Copy link
Contributor

qreshi commented Oct 14, 2021

Let's change the target branch to main to merge it in there first. This will also run the GitHub CI since we have it to only run against main (which we should also change later).

@AWSHurneyt
Copy link
Collaborator Author

Let's change the target branch to main to merge it in there first. This will also run the GitHub CI since we have it to only run against main (which we should also change later).

Will do.

@AWSHurneyt AWSHurneyt changed the base branch from 1.1 to main October 14, 2021 21:08
@codecov-commenter
Copy link

Codecov Report

Merging #205 (fd3605e) into main (dc6ecdc) will increase coverage by 0.07%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##               main     #205      +/-   ##
============================================
+ Coverage     78.79%   78.86%   +0.07%     
- Complexity      214      215       +1     
============================================
  Files           172      172              
  Lines          6951     6956       +5     
  Branches        905      905              
============================================
+ Hits           5477     5486       +9     
+ Misses          989      986       -3     
+ Partials        485      484       -1
Impacted Files Coverage Δ
...rting/transport/TransportAcknowledgeAlertAction.kt 91.04% <100.00%> (+0.72%) ⬆️
...in/kotlin/org/opensearch/alerting/MonitorRunner.kt 71.38% <0.00%> (-0.68%) ⬇️
...ing/model/destination/DestinationContextFactory.kt 66.66% <0.00%> (ø)
...ain/kotlin/org/opensearch/alerting/AlertService.kt 79.02% <0.00%> (+0.48%) ⬆️
...lin/org/opensearch/alerting/alerts/AlertIndices.kt 67.11% <0.00%> (+1.34%) ⬆️
...alerting/resthandler/RestAcknowledgeAlertAction.kt 90.00% <0.00%> (+3.33%) ⬆️
...ing/destination/client/DestinationEmailClient.java 77.50% <0.00%> (+5.00%) ⬆️

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 dc6ecdc...fd3605e. Read the comment docs.

@AWSHurneyt
Refactored integ tests based on PR feedback, and listed the bug fix i…
e1250d7 
…n the release notes. Signed-off-by: Thomas Hurney <hurneyt@amazon.com>
@AWSHurneyt
Removing bug fixes from release notes. Currently discussing adding se…
01ce30a 
…parate notes for this patch. Signed-off-by: Thomas Hurney <hurneyt@amazon.com>
@AWSHurneyt AWSHurneyt merged commit c93715f into opensearch-project:main Oct 15, 2021
This was referenced Oct 15, 2021
Merged
Closed
@AWSHurneyt AWSHurneyt mentioned this pull request Oct 15, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skkosuri-amzn skkosuri-amzn skkosuri-amzn approved these changes

@qreshi qreshi qreshi approved these changes

@annie3431 annie3431 Awaiting requested review from annie3431

@lezzago lezzago Awaiting requested review from lezzago lezzago is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@AWSHurneyt @skkosuri-amzn @qreshi @codecov-commenter @adityaj1107 @dblock