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 fetching of channels for composite monitors #825

Merged
merged 1 commit into from
Mar 19, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport e4412d2 from #820.

* fixed incorrect use of this.props

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* resolved dependency conflict

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated babel config

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit e4412d2)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@amsiglan amsiglan merged commit 0bb3596 into 2.x Mar 19, 2024
6 of 15 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 23, 2024
* fixed incorrect use of this.props

* resolved dependency conflict

* updated babel config

---------

(cherry picked from commit e4412d2)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.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>
(cherry picked from commit 0bb3596)
Signed-off-by: github-actions[bot] <github-actions[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.

2 participants