[Hawkular-commits] [hawkular/hawkular-alerts] 267de6: HWKALERTS-64 Add handling at manual resolve time

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: 267de636d7b415ce04197cf358b09cccd1087ca7 https://github.com/hawkular/hawkular-alerts/commit/267de636d7b415ce04197c... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-09 (Thu, 09 Jul 2015) Changed paths: 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/test/java/org/hawkular/alerts/api/JsonJacksonTest.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json 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/RulesEngineTest.java M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json Log Message: ----------- HWKALERTS-64 Add handling at manual resolve time - Triggers now support the autoEnable option, default=false. To be used with autoDisable, automatically [re-]enable a disabled trigger when its alerts have been manually resolved. - For autoResolve triggers, if the trigger's alerts are instead manually resolved, set the trigger back to firing mode. This is not an option but an improved behavior. - add db support for new triggers.autoEnable field. - add new lifecycle itests - add/fix some cleanup in lifecycle itests and fix a query in the paging test, this fixes some issues with repeated runs. - when setting a trigger for autoDisable or autoResolve in the rulebase, it is not necessary to re-insert the updated trigger (or dampening). The trigger will be reloaded as part if the handling, so simplify by just retracting. be implicitly reloaded Commit: 546c5ef579cd235514d25eaa1eb46b06952de8fe https://github.com/hawkular/hawkular-alerts/commit/546c5ef579cd235514d25e... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-07-10 (Fri, 10 Jul 2015) Changed paths: 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/test/java/org/hawkular/alerts/api/JsonJacksonTest.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json 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/RulesEngineTest.java M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json Log Message: ----------- Merge pull request #68 from jshaughn/hwkalerts-64 HWKALERTS-64 Add handling at manual resolve time Compare: https://github.com/hawkular/hawkular-alerts/compare/862e201b8671...546c5e...