opensearch-project / alerting

📟 Get notified when your data meets certain conditions by setting up monitors, alerts, and notifications
https://opensearch.org/docs/latest/monitoring-plugins/alerting/index/
Apache License 2.0
60 stars 102 forks source link

[Backport 2.x] ipaddress lib upgrade as part of cve fix #1407

Closed opensearch-trigger-bot[bot] closed 8 months ago

opensearch-trigger-bot[bot] commented 8 months ago

Backport 8d5906019222b2043ae73d0d8edda54a6fc103c5 from #1397.

opensearch-trigger-bot[bot] commented 7 months ago

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

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

opensearch-trigger-bot[bot] commented 7 months ago

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

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