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

Temporary fix for blank monitor name on Monitors page issue. #593

Merged
merged 5 commits into from Jul 10, 2023

Conversation

AWSHurneyt
Copy link
Collaborator

Description

  1. Added a temporary fix for the null monitor name issue. More investigation will be needed to find and resolve the root cause. I've summarized my findings in the issue itself.
  2. Added cypress test for the Monitor list page. This new test requires this backend PR to be merged to pass.
  3. Fixed a display issue on the cluster metrics monitor configuration component.

Issues Resolved

opensearch-project/alerting#1060

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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.

… automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
lezzago
lezzago previously approved these changes Jul 10, 2023
@AWSHurneyt
Copy link
Collaborator Author

Cypress tests are currently failing on main branch.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt AWSHurneyt merged commit c152885 into opensearch-project:main Jul 10, 2023
6 of 7 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 10, 2023
* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 10, 2023
* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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-593-to-2.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c152885b23ae2a883d8c726a60c7ad9154671174
# Push it to GitHub
git push --set-upstream origin backport/backport-593-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-593-to-2.4.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 10, 2023
* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 10, 2023
* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 10, 2023
* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 10, 2023
* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)
bowenlan-amzn pushed a commit that referenced this pull request Jul 11, 2023
…600)

* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit that referenced this pull request Sep 12, 2023
…601)

* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit that referenced this pull request Sep 12, 2023
…602)

* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit that referenced this pull request Sep 12, 2023
…603)

* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit that referenced this pull request Sep 12, 2023
…604)

* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit that referenced this pull request Sep 12, 2023
…605)

* Refactored the cluster metrics monitor configuration component to not automatically execute the monitor dryrun when there are no triggers defined.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Temporary fix for bug described in issue 569.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed display issue.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed unit test. Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit c152885)

Co-authored-by: AWSHurneyt <hurneyt@amazon.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.

None yet

3 participants