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

[Backport 2.x] fix for ERROR alert state generation in doc-level monitors #771

Merged
merged 1 commit into from
Jan 30, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport daf8c7c from #768

Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit daf8c7c)
@opensearch-trigger-bot opensearch-trigger-bot bot requested a review from a team January 27, 2023 23:20
@codecov-commenter
Copy link

codecov-commenter commented Jan 27, 2023

Codecov Report

Merging #771 (5abba1e) into 2.x (61ce7d9) will increase coverage by 0.14%.
The diff coverage is 82.35%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##                2.x     #771      +/-   ##
============================================
+ Coverage     75.50%   75.64%   +0.14%     
  Complexity      116      116              
============================================
  Files           125      125              
  Lines          6825     6832       +7     
  Branches       1023     1025       +2     
============================================
+ Hits           5153     5168      +15     
- Misses         1136     1138       +2     
+ Partials        536      526      -10     
Impacted Files Coverage Δ
.../opensearch/alerting/DocumentLevelMonitorRunner.kt 79.51% <82.35%> (+1.93%) ⬆️
...otlin/org/opensearch/alerting/alerts/AlertMover.kt 62.96% <0.00%> (-7.41%) ⬇️
...in/org/opensearch/alerting/MonitorRunnerService.kt 79.59% <0.00%> (-2.05%) ⬇️
...destinationmigration/DestinationConversionUtils.kt 68.88% <0.00%> (-1.12%) ⬇️
...ing/model/destination/DestinationContextFactory.kt 75.00% <0.00%> (ø)
...rg/opensearch/alerting/BucketLevelMonitorRunner.kt 79.56% <0.00%> (+0.43%) ⬆️
...ain/kotlin/org/opensearch/alerting/AlertService.kt 80.00% <0.00%> (+0.93%) ⬆️
.../org/opensearch/alerting/model/MonitorRunResult.kt 87.12% <0.00%> (+2.97%) ⬆️
...tlin/org/opensearch/alerting/util/AlertingUtils.kt 68.75% <0.00%> (+15.62%) ⬆️

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

@sbcd90 sbcd90 merged commit a69d762 into 2.x Jan 30, 2023
@github-actions github-actions bot deleted the backport/backport-768-to-2.x branch January 30, 2023 17:08
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.3 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-2.3 2.3
# Navigate to the new working tree
cd .worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-771-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a69d762d79498d38f1c8d48255e135836010f177
# Push it to GitHub
git push --set-upstream origin backport/backport-771-to-2.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.3

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

@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.4 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-2.4 2.4
# Navigate to the new working tree
cd .worktrees/backport-2.4
# Create a new branch
git switch --create backport/backport-771-to-2.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a69d762d79498d38f1c8d48255e135836010f177
# Push it to GitHub
git push --set-upstream origin backport/backport-771-to-2.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.4

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

opensearch-trigger-bot bot added a commit that referenced this pull request Jan 30, 2023
eirsep pushed a commit that referenced this pull request Jan 30, 2023
…) (#772)

Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit a69d762)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
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.

3 participants