Branch: refs/heads/wintermute Home: https://github.com/hawkular/hawkular-alerts Commit: 236014c481f076748b354b2c3a4e080b2cab1c9e https://github.com/hawkular/hawkular-alerts/commit/236014c481f076748b354b... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-04-22 (Wed, 22 Apr 2015) Changed paths: M hawkular-actions-plugins/hawkular-actions-email/src/test/java/org/hawkular/actions/email/listener/EmailListenerTest.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.data M hawkular-alerts-engine/src/main/resources/hawkular-alerts/dampening.data M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data M hawkular-alerts-rest-tests/pom.xml M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/AlertsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/DampeningITest.groovy A hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/dampening.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers.data M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java Log Message: ----------- HWKALERTS-35 Add Ack and Resolved lifecycle support for alerts. Also, replace Trigger "safety" mode with AutoResolve. And add AutoDisable support as well. The following commits were squashed into this commit: WIP Hawkular-35 - finish initial coding for alert lifecycle support - adding tests, more tests pending - converted some existing testcode from java asserts to junit asserts because java asserts are ignored unless explicitly enabled for the JVM, making it dangerous for test code. The java assertions may not get processed. WIP Hawkular-35: Add REST support for new alert fetch criteria WIP Hawkular-35 - ready for review - Add rest services for ack and resolve - Add groovy integration tests for autoDisable, autoResolve, manual ack and manual resolve. - fix bugs - add more properties to pom for finer control over the base uri segments. This allows use of the bus' RestClient to send messages to the bus (because the groovyx client can't handle the response given by the activeMQ rest.war. NOTE: Had to currently comment out the start/stop of the WFly server. I was getting a trange VersionResolver error from Maven. Also, we need a way to disable this with a prop other than skipTests, so that we can run the server manually. Commit: 37900fb6209af2679e73342c1b64c61bbc2ee9f9 https://github.com/hawkular/hawkular-alerts/commit/37900fb6209af2679e7334... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-04-22 (Wed, 22 Apr 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java Log Message: ----------- PR feedback, removing some dead code Commit: 195466f8d520dc306601557d21de5b2e812b5ca9 https://github.com/hawkular/hawkular-alerts/commit/195466f8d520dc30660155... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-04-22 (Wed, 22 Apr 2015) Changed paths: M hawkular-alerts-rest-tests/pom.xml Log Message: ----------- PR comment and also re: HWKALERTS-38. Uncomment the wfly plugin start/stop stuff but move to a different profile, -Pwildfly. This way it's easy to execute the tests against a manually started wildfly server that can continue running through several test executions. The problem reported in HWKALERTS-38 now requires -Pwildfly if executed against a branch with this commit. Commit: 12a447c535db1ab650df58b726660bd6e02ca7c8 https://github.com/hawkular/hawkular-alerts/commit/12a447c535db1ab650df58... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-04-23 (Thu, 23 Apr 2015) Changed paths: M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers.data Log Message: ----------- Fix header comment and correct typo in action for trigger-6 Commit: 26d486d4233647b4b5679212901e0d3315582dba https://github.com/hawkular/hawkular-alerts/commit/26d486d4233647b4b56792... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-04-23 (Thu, 23 Apr 2015) Changed paths: M hawkular-alerts-rest-tests/pom.xml Log Message: ----------- Bring back -Prest to work with travis. Add -Prest-only to execute the tests against a manually started wildfly instance. Commit: 0c79adeff6714ad7c198a1628d67fbc59248d2b5 https://github.com/hawkular/hawkular-alerts/commit/0c79adeff6714ad7c198a1... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-04-23 (Thu, 23 Apr 2015) Changed paths: M hawkular-actions-plugins/hawkular-actions-email/src/test/java/org/hawkular/actions/email/listener/EmailListenerTest.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.data M hawkular-alerts-engine/src/main/resources/hawkular-alerts/dampening.data M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data M hawkular-alerts-rest-tests/pom.xml M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/AlertsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/DampeningITest.groovy A hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/dampening.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers.data M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java Log Message: ----------- Merge pull request #37 from jshaughn/lifecycle-squash HWKALERTS-35 Compare: https://github.com/hawkular/hawkular-alerts/compare/28a85ce3b4ce...0c79ad...