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.

Sign up for GitHub

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

Jump to bottom

[Composite monitor] UX updates #679

Merged
merged 5 commits into from
Aug 9, 2023
Merged

[Composite monitor] UX updates #679

merged 5 commits into from
Aug 9, 2023

Conversation

amsiglan
Copy link
Collaborator

@amsiglan amsiglan commented Aug 8, 2023

Description

This PR

  • Updates monitor overview section in details page to show the related monitors with responsive design
  • Updates the trigger condition builder to have two monitors by default for every new trigger and only show delete button when there are more than 2 monitors expressions
  • Updates API used to fetch alerts from delegate monitors for a chained alert

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.

@amsiglan
updated composite monitors ux
106c7a4 
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
@amsiglan
updated tests
b339acc 
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
@codecov
Copy link

codecov bot commented Aug 8, 2023 •
edited
Loading

Codecov Report

Merging #679 (73f3ed9) into main (1741371) will decrease coverage by 0.20%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #679      +/-   ##
==========================================
- Coverage   50.06%   49.87%   -0.20%     
==========================================
  Files         231      233       +2     
  Lines        6503     6567      +64     
  Branches      927      938      +11     
==========================================
+ Hits         3256     3275      +19     
- Misses       3244     3289      +45     
  Partials        3        3

see 10 files with indirect coverage changes

@amsiglan
remove expression when monitor unselected in list
9435919 
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
@amsiglan
addressed PR comments
91b1f26 
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
AWSHurneyt
AWSHurneyt previously approved these changes Aug 8, 2023
View reviewed changes
Copy link
Collaborator

@AWSHurneyt AWSHurneyt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Approved assuming cypress tests succeed locally.

@amsiglan
fixed cypress test
73f3ed9 
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
@amsiglan
Copy link
Collaborator Author

amsiglan commented Aug 8, 2023

Cypress tests passed locally.

@amsiglan amsiglan merged commit 5025ae3 into opensearch-project:main Aug 9, 2023
7 of 9 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 9, 2023
@github-actions
[Composite monitor] UX updates (#679)
037396f 
* updated composite monitors ux

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

* updated tests

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

* remove expression when monitor unselected in list

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

* addressed PR comments

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

* fixed cypress test

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

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 5025ae3)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Aug 9, 2023
Merged
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 9, 2023
@github-actions
[Composite monitor] UX updates (#679)
8b14853 
* updated composite monitors ux

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

* updated tests

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

* remove expression when monitor unselected in list

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

* addressed PR comments

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

* fixed cypress test

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

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 5025ae3)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Aug 9, 2023
Merged
amsiglan pushed a commit that referenced this pull request Aug 15, 2023
@opensearch-trigger-bot @github-actions
[Composite monitor] UX updates (#679) (#680)
8f34066 
* updated composite monitors ux



* updated tests



* remove expression when monitor unselected in list



* addressed PR comments



* fixed cypress test



---------


(cherry picked from commit 5025ae3)

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>
amsiglan pushed a commit that referenced this pull request Aug 15, 2023
@opensearch-trigger-bot @github-actions
[Composite monitor] UX updates (#679) (#681)
370cb5e 
* updated composite monitors ux



* updated tests



* remove expression when monitor unselected in list



* addressed PR comments



* fixed cypress test



---------


(cherry picked from commit 5025ae3)

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>
@AWSHurneyt AWSHurneyt mentioned this pull request Nov 3, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AWSHurneyt AWSHurneyt AWSHurneyt approved these changes

@sbcd90 sbcd90 sbcd90 approved these changes

@lezzago lezzago Awaiting requested review from lezzago lezzago is a code owner

@eirsep eirsep Awaiting requested review from eirsep eirsep is a code owner

@getsaurabh02 getsaurabh02 Awaiting requested review from getsaurabh02 getsaurabh02 is a code owner

@praveensameneni praveensameneni Awaiting requested review from praveensameneni praveensameneni is a code owner

@qreshi qreshi Awaiting requested review from qreshi

@bowenlan-amzn bowenlan-amzn Awaiting requested review from bowenlan-amzn bowenlan-amzn is a code owner

@rishabhmaurya rishabhmaurya Awaiting requested review from rishabhmaurya rishabhmaurya is a code owner

Assignees
No one assigned
Labels
backport 2.x backport 2.9
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@amsiglan @sbcd90 @AWSHurneyt