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

Backports #1079 (Chained Alert Behaviour Changes ) #1092

Merged
merged 3 commits into from
Aug 16, 2023

Conversation

eirsep
Copy link
Member

@eirsep eirsep commented Aug 16, 2023

Backports #1079 as main branch is unstable pending on fixes from Opensearch core's breaking change refactor on dependencies.

eirsep added 3 commits August 15, 2023 17:59
Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
@codecov
Copy link

codecov bot commented Aug 16, 2023

Codecov Report

Merging #1092 (018dea4) into 2.9 (ca28061) will decrease coverage by 0.06%.
The diff coverage is 68.62%.

@@             Coverage Diff              @@
##                2.9    #1092      +/-   ##
============================================
- Coverage     67.88%   67.83%   -0.06%     
  Complexity      119      119              
============================================
  Files           160      160              
  Lines         10467    10563      +96     
  Branches       1576     1599      +23     
============================================
+ Hits           7106     7165      +59     
- Misses         2662     2693      +31     
- Partials        699      705       +6     
Files Changed Coverage Δ
...org/opensearch/alerting/workflow/WorkflowRunner.kt 1.13% <0.00%> (-0.03%) ⬇️
...n/kotlin/org/opensearch/alerting/TriggerService.kt 71.05% <50.00%> (-0.57%) ⬇️
...ting/transport/TransportGetWorkflowAlertsAction.kt 67.42% <66.66%> (-0.55%) ⬇️
...earch/alerting/workflow/CompositeWorkflowRunner.kt 72.01% <67.24%> (+1.24%) ⬆️
...ain/kotlin/org/opensearch/alerting/AlertService.kt 79.74% <71.95%> (-2.03%) ⬇️
...ting/script/ChainedAlertTriggerExecutionContext.kt 58.82% <100.00%> (-14.26%) ⬇️

... and 4 files with indirect coverage changes

@eirsep eirsep merged commit 301e36c into opensearch-project:2.9 Aug 16, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

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

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