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

Enable cross-cluster monitor cluster setting #1612

Merged
merged 2 commits into from
Jul 19, 2024

Conversation

goyamegh
Copy link
Collaborator

Issue #, if available:

Description of changes:
Enable cross-cluster monitor cluster setting

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: Megha Goyal <goyamegh@amazon.com>
@AWSHurneyt
Copy link
Collaborator

Approving assuming CI passes.

@AWSHurneyt
Copy link
Collaborator

Backporting back to v2.14 as the feature received GA launch approval after 2.13 open source release.

@AWSHurneyt
Copy link
Collaborator

The failing test is org.opensearch.alerting.transport.GetRemoteIndexesActionIT > test with remote monitoring disabled.
https://github.com/opensearch-project/alerting/actions/runs/9999216318/job/27639794066?pr=1612#step:5:334

That test suite has a helper function which should be toggling the feature on/off; but it looks like it's failing to disable to feature before the start of that test. Troubleshooting that test.

Signed-off-by: Megha Goyal <goyamegh@amazon.com>
@AWSHurneyt
Copy link
Collaborator

The failing test is org.opensearch.alerting.transport.GetRemoteIndexesActionIT > test with remote monitoring disabled. https://github.com/opensearch-project/alerting/actions/runs/9999216318/job/27639794066?pr=1612#step:5:334

That test suite has a helper function which should be toggling the feature on/off; but it looks like it's failing to disable to feature before the start of that test. Troubleshooting that test.

Fixed in commit 478eb46

@jowg-amazon jowg-amazon merged commit 7c69e09 into opensearch-project:main Jul 19, 2024
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-1612-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7c69e091c81f585ebf5a1e96bfab862dab990191
# Push it to GitHub
git push --set-upstream origin backport-1612-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-1612-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.14 failed:

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

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

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.15 failed:

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

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

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

goyamegh added a commit to goyamegh/alerting that referenced this pull request Jul 19, 2024
Signed-off-by: Megha Goyal <goyamegh@amazon.com>
AWSHurneyt pushed a commit that referenced this pull request Jul 19, 2024
Signed-off-by: Megha Goyal <goyamegh@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 19, 2024
Signed-off-by: Megha Goyal <goyamegh@amazon.com>
(cherry picked from commit f0ff930)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 19, 2024
Signed-off-by: Megha Goyal <goyamegh@amazon.com>
(cherry picked from commit f0ff930)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AWSHurneyt pushed a commit that referenced this pull request Jul 19, 2024
(cherry picked from commit f0ff930)

Signed-off-by: Megha Goyal <goyamegh@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>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 24, 2024
Signed-off-by: Megha Goyal <goyamegh@amazon.com>
(cherry picked from commit f0ff930)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AWSHurneyt pushed a commit that referenced this pull request Jul 25, 2024
(cherry picked from commit f0ff930)

Signed-off-by: Megha Goyal <goyamegh@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>
AWSHurneyt added a commit that referenced this pull request Jul 30, 2024
AWSHurneyt added a commit that referenced this pull request Jul 30, 2024
AWSHurneyt added a commit that referenced this pull request Jul 30, 2024
AWSHurneyt added a commit that referenced this pull request Jul 30, 2024
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