Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: e816498e82e7d3f9236c8c53ed79be904fed1f82 https://github.com/hawkular/hawkular-alerts/commit/e816498e82e7d3f9236c8c... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-09-02 (Wed, 02 Sep 2015) Changed paths: R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GroupConditionInfo.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GroupConditionsInfo.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ConditionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- HWKALERTS-83 Add setConditions to REST API - add PUT /alerts/triggers/{triggerId}/conditions/{triggerMode} - now manage the condition set as a whole. this should simplify managing conditions as well as simplify the API. - deprecate add/delete/updateCondition endpoints/services - remove use of deprecated services in hawkular-alerts code (other than to support the deprecated rest services) - add PUT /alerts/triggers/groups/{groupId}/conditions/{triggerMode} - analogous enpoint for group triggers - remove add/delete/updateGroupCondition endpoints/services (these can be removed as they were never released) - rename GroupConditionInfo to GroupConditionsInfo, and update to handle a condition set as opposed to a single condition. - fix bug in addGroupMember, it was not applying group tags. - increase max-sleep time on LifecycleItests that generate higher number of alerts as part of the test. Commit: 55044e3ca55a19ddae213b6b0b82eb7dde80fb23 https://github.com/hawkular/hawkular-alerts/commit/55044e3ca55a19ddae213b... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GroupConditionInfo.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GroupConditionsInfo.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ConditionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- Merge pull request #86 from jshaughn/hwkalerts-83 HWKALERTS-83 Add setConditions to REST API Compare: https://github.com/hawkular/hawkular-alerts/compare/f559959a197a...55044e...