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] Composite monitors #614

Merged
merged 1 commit into from
Jul 12, 2023
Merged

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport bb2ed74 from #611

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Add composite monitor type #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* new columns with deletion modal for monitors list; added condition column to triggers

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review #573

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress tests

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress tests

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Unit tests

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Unit tests

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Add visual editor callout message for advanced conditions

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Add visual editor callout message for advanced conditions

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Add visual editor callout message for advanced conditions

Signed-off-by: Jovan Cvetkovic <[email protected]>

* auto add cinditions when associated monitor is selected

Signed-off-by: Jovan Cvetkovic <[email protected]>

* getting associated monitors count

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* ux updates

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* Adds multiple triggers

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Adds multiple triggers

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Adds multiple triggers

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Adds multiple triggers

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Adds multiple triggers

Signed-off-by: Jovan Cvetkovic <[email protected]>

* integrated all apis; monitor deletion added

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* fixed delete modal

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* fixed ux issues from bug bash

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* addressed UX feedback

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* fixed monitor service

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* fixed build error; schedule

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* updated snapshots

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* addressed PR comments; changed description texts

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* fixed cypress tests

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* updated cypress tests

Signed-off-by: Amardeepsingh Siglani <[email protected]>

* removed commented code

Signed-off-by: Amardeepsingh Siglani <[email protected]>

---------

Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Amardeepsingh Siglani <[email protected]>
Co-authored-by: Jovan Cvetkovic <[email protected]>
(cherry picked from commit bb2ed74)
@codecov
Copy link

codecov bot commented Jul 12, 2023

Codecov Report

Merging #614 (25c90ad) into 2.x (8763401) will decrease coverage by 1.98%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              2.x     #614      +/-   ##
==========================================
- Coverage   51.97%   50.00%   -1.98%     
==========================================
  Files         220      231      +11     
  Lines        5866     6502     +636     
  Branches      847      925      +78     
==========================================
+ Hits         3049     3251     +202     
- Misses       2814     3248     +434     
  Partials        3        3              

see 48 files with indirect coverage changes

@amsiglan amsiglan merged commit 9db372c into 2.x Jul 12, 2023
@github-actions github-actions bot deleted the backport/backport-611-to-2.x branch July 12, 2023 02:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants