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

Composite monitors #611

Merged

Conversation

amsiglan
Copy link
Collaborator

Description

This PR adds a new monitor type - Composite monitor which provides user with ability to combine existing monitors using trigger conditions and generate alerts when the trigger conditions are satisfied.

Issues Resolved

#610

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.

jovancvetkovic3006 and others added 30 commits June 9, 2023 17:18
…lumn to triggers

Signed-off-by: Amardeepsingh Siglani <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
@lezzago
Copy link
Member

lezzago commented Jul 11, 2023

Also we might want to consolidate the terms composite and workflows

@codecov
Copy link

codecov bot commented Jul 11, 2023

Codecov Report

Merging #611 (e2204d5) into main (18bdd05) will decrease coverage by 1.98%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #611      +/-   ##
==========================================
- 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 added 2 commits July 11, 2023 15:27
Signed-off-by: Amardeepsingh Siglani <[email protected]>
Signed-off-by: Amardeepsingh Siglani <[email protected]>
@amsiglan amsiglan changed the title Composite monitor list and details Composite monitors Jul 11, 2023
Signed-off-by: Amardeepsingh Siglani <[email protected]>
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.

Most of my comments are non-blocking; so I think it would be fine to create a github issue to track any of those changes for a future release.

Comment on lines +47 to +50
cy.contains('Create monitor', { timeout: 20000 });

// Go to create monitor page
cy.contains('Create monitor').click({ force: true });
Copy link
Collaborator

Choose a reason for hiding this comment

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

Non-blocking nitpick: This could probably be simplified to:

cy.contains('Create monitor', { timeout: 20000 }).click({ force: true });

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Let me do it in follow up PR

Comment on lines +142 to +173
const body = {
size: 200,
query: {
match_all: {},
},
};
cy.request({
method: 'GET',
url: `${Cypress.env('opensearch')}${API.MONITOR_BASE}/_search`,
failOnStatusCode: false, // In case there is no alerting config index in cluster, where the status code is 404
body,
}).then((response) => {
if (response.status === 200) {
const monitors = response.body.hits.hits;
const createdMonitor = _.find(
monitors,
(monitor) => monitor._source.name === SAMPLE_VISUAL_EDITOR_MONITOR
);
if (createdMonitor) {
cy.visit(
`${Cypress.env('opensearch_dashboards')}/app/${PLUGIN_NAME}#/monitors/${
createdMonitor._id
}?action=update-monitor&type=workflow`
);
} else {
cy.log('Failed to get created monitor ', SAMPLE_VISUAL_EDITOR_MONITOR);
throw new Error(`Failed to get created monitor ${SAMPLE_VISUAL_EDITOR_MONITOR}`);
}
} else {
cy.log('Failed to get all monitors.', response);
}
});
Copy link
Collaborator

Choose a reason for hiding this comment

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

Non-blocking, but would this be better as a custom command we add in our cypress/support/commands.js?

}
target="_blank"
>
Learn more.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nitpick: Do we typically have a . in the Learn more link text? A quick search suggests we don't typically include it https://github.com/search?q=repo%3Aopensearch-project%2Falerting-dashboards-plugin+%22Learn+more%22&type=code

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Let me fix this in a follow up PR

const setFormikValues = (selected, monitorIdx, form) => {
const associatedMonitors = _.get(
values,
'associatedMonitors',
Copy link
Collaborator

Choose a reason for hiding this comment

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

Non-blocking nitpick: Noticed you had the formikValueName const above which could probably be used here.

public/pages/Dashboard/utils/helpers.js Show resolved Hide resolved
default:
return trigger[TRIGGER_TYPE.QUERY_LEVEL];
}
});
}

const expressionsToCondition = (expressions) => {
const conditionMap = {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Non-blocking nitpick: I think I've seen this map in a few places. Could be worthwhile to extract it into a helper file somewhere.

Comment on lines +87 to +90
this.setState({ items: triggers });
} else {
this.setState({ items: triggers });
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Non-blocking nitpick: It looks like this.setState({ items: triggers }); is called in both the if/else blocks; so it could be simplified by just moving it out of the block.

@@ -47,6 +47,22 @@ export const inputLimitText = (
);
};

export async function deleteMonitor(monitor, httpClient, notifications) {
const { id, version } = monitor;
const poolType = monitor.item_type === 'composite' ? 'workflows' : 'monitors';
Copy link
Collaborator

Choose a reason for hiding this comment

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

Non-blocking nitpick: It may be worthwhile to compile an exhaustive list of item_types in a constant somewhere.

@@ -137,7 +238,10 @@ export default class MonitorService {
}

const { callAsCurrentUser } = await this.esDriver.asScoped(req);
const updateResponse = await callAsCurrentUser('alerting.updateMonitor', params);
const updateResponse = await callAsCurrentUser(
`alerting.${type === 'workflow' ? 'updateWorkflow' : 'updateMonitor'}`,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Non-blocking nitpick: It may be worthwhile to compile an exhaustive list of types in a constant somewhere.

@amsiglan amsiglan merged commit bb2ed74 into opensearch-project:main Jul 12, 2023
@amsiglan
Copy link
Collaborator Author

All nitpicks will be addressed in follow up PR

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 12, 2023
* [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)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 12, 2023
* [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)
amsiglan added a commit that referenced this pull request Jul 12, 2023
* [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)

Co-authored-by: Amardeepsingh Siglani <[email protected]>
amsiglan added a commit that referenced this pull request Jul 12, 2023
* [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)

Co-authored-by: Amardeepsingh Siglani <[email protected]>
@lezzago lezzago mentioned this pull request Jul 15, 2023
5 tasks
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.

4 participants