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

Alerting Enhancements: Alerting Comments (Experimental) #1561

Merged
merged 24 commits into from
Jun 12, 2024

Conversation

toepkerd
Copy link
Contributor

@toepkerd toepkerd commented May 29, 2024

Issue #, if available:
#1500
Description of changes:

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.

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
…nd AlertContext field, but only AlertContext field

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
@toepkerd toepkerd changed the title Alerting enhancements Alerting Enhancements: Alerting Comments (Experimental) Jun 7, 2024
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
toepkerd-zz and others added 4 commits June 10, 2024 20:03
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
@toepkerd toepkerd marked this pull request as ready for review June 11, 2024 22:58
@toepkerd toepkerd requested a review from lezzago as a code owner June 11, 2024 22:58
@riysaxen-amzn
Copy link
Collaborator

let's add some more tests to verify all the behavior and edge cases.

@riysaxen-amzn
Copy link
Collaborator

rest lgtm , approving assuming CI will pass. But make sure CI passes before merging

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
@amsiglan
Copy link
Collaborator

rest lgtm , approving assuming CI will pass. But make sure CI passes before merging

We will fix the CIs in follow up PR. @toepkerd is working on it

@AWSHurneyt AWSHurneyt merged commit d808474 into opensearch-project:main Jun 12, 2024
10 of 18 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.x
# Create a new branch
git switch --create backport-1561-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d808474cf308943b0424bebe2192c2d8bcfc4b18
# Push it to GitHub
git push --set-upstream origin backport-1561-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-1561-to-2.x.

AWSHurneyt pushed a commit that referenced this pull request Jun 12, 2024
#1561) (#1572)

* Alerting Enhancements: Alerting Comments (Experimental) (#1561)

* initial commit, functional but needs refactoring

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* refactored QueryLevelTriggerExecutionContext to not need both Alert and AlertContext field, but only AlertContext field

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc additions and fixes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc cleanup

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc changes and basic ITs

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* cleanup

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* renaming notes to comments

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc changes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* changed API endpoints

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* more misc changes and fixes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc cleanup

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* updated a comment

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc cleanup and setting refresh policy to immediate

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* fixed lint issues and other restructuring

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* review-based changes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* update after adding entityType to Comment model

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc fixes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* removing comments history enabled setting

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* adding release notes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* IT fixes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* removing dev code vestiges

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* changing logger calls

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

---------

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Co-authored-by: Dennis Toepker <toepkerd@amazon.com>

* fixed imports

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

---------

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Co-authored-by: Dennis Toepker <toepkerd@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 12, 2024
#1561) (#1572)

* Alerting Enhancements: Alerting Comments (Experimental) (#1561)

* initial commit, functional but needs refactoring

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* refactored QueryLevelTriggerExecutionContext to not need both Alert and AlertContext field, but only AlertContext field

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc additions and fixes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc cleanup

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc changes and basic ITs

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* cleanup

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* renaming notes to comments

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc changes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* changed API endpoints

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* more misc changes and fixes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc cleanup

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* updated a comment

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc cleanup and setting refresh policy to immediate

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* fixed lint issues and other restructuring

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* review-based changes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* update after adding entityType to Comment model

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* misc fixes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* removing comments history enabled setting

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* adding release notes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* IT fixes

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* removing dev code vestiges

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

* changing logger calls

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

---------

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Co-authored-by: Dennis Toepker <toepkerd@amazon.com>

* fixed imports

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>

---------

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Co-authored-by: Dennis Toepker <toepkerd@amazon.com>
(cherry picked from commit f52eb2a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
jowg-amazon pushed a commit that referenced this pull request Jun 12, 2024
#1561) (#1572) (#1573)

* Alerting Enhancements: Alerting Comments (Experimental) (#1561)

* initial commit, functional but needs refactoring



* refactored QueryLevelTriggerExecutionContext to not need both Alert and AlertContext field, but only AlertContext field



* misc additions and fixes



* misc cleanup



* misc changes and basic ITs



* cleanup



* renaming notes to comments



* misc changes



* changed API endpoints



* more misc changes and fixes



* misc cleanup



* updated a comment



* misc cleanup and setting refresh policy to immediate



* fixed lint issues and other restructuring



* review-based changes



* update after adding entityType to Comment model



* misc fixes



* removing comments history enabled setting



* adding release notes



* IT fixes



* removing dev code vestiges



* changing logger calls



---------




* fixed imports



---------



(cherry picked from commit f52eb2a)

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dennis Toepker <toepkerd@amazon.com>
@toepkerd toepkerd deleted the alerting-enhancements branch June 12, 2024 19:04
@toepkerd
Copy link
Contributor Author

CIs have been fixed and merged in this followup PR: #1574

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants