Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: 3f20e552f4e42594ba865cc562a2f838cb525bf5 https://github.com/hawkular/hawkular-alerts/commit/3f20e552f4e42594ba865c... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-08-03 (Mon, 03 Aug 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl Log Message: ----------- Possible change in Dampening approach to better handle ANY-match trigger dampening. It actually simplifies the rules and I'm not sure if there is really any additional cost. May need a perf test. Commit: 9b504ca1816676f54927e145761b3bd8b86b8e4c https://github.com/hawkular/hawkular-alerts/commit/9b504ca1816676f54927e1... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-08-03 (Mon, 03 Aug 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java Log Message: ----------- - Add test for multi-condition ANY-match trigger - remove some errant code Commit: f1383321c8f94acd989864fbeea9ab56451869f3 https://github.com/hawkular/hawkular-alerts/commit/f1383321c8f94acd989864... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-08-03 (Mon, 03 Aug 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/DampeningITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy Log Message: ----------- HWKALERTS-74 ANY-Match Dampening - add validators in Dampening.forXxx methods - replace some constructor use with Dampening.forXxx - add some sleep time to lifecycle itests but print perf msg when it runs unecepectedly long. Note that recently it is taking longer to process the alerting, or maybe I am imagining it. Commit: b5b12533c140dee8c48031ae51583d4719b0f417 https://github.com/hawkular/hawkular-alerts/commit/b5b12533c140dee8c48031... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-08-03 (Mon, 03 Aug 2015) Changed paths: M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java Log Message: ----------- HWKALERTS-74 fix master rebase issues - get File action to work on windows - don't assume unix filename - change Alert Ids to be usable in windows filenames, replace '|' delimiter with '-', which is what we use elsewhere in Condition and Dampening. Commit: f9c88fc4a6561605b1ab4b130acde7401fb69247 https://github.com/hawkular/hawkular-alerts/commit/f9c88fc4a6561605b1ab4b... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-08-04 (Tue, 04 Aug 2015) Changed paths: M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassCluster.java Log Message: ----------- HWKALERTS-74 unrelated: tweak session management After rebasing on master I had a lot of trouble getting alerts to deploy correctly in Hawkular Dist. Schema creation was failing on what appeared to be some sort of resource conflict. After some investigation it looked to me like the getSession() needed to be synchronized to avoid the possibility of two threads trying to create the schema at the same time. Commit: ed3ef82774e2653119699df04ada03eb022eb40e https://github.com/hawkular/hawkular-alerts/commit/ed3ef82774e2653119699d... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-08-17 (Mon, 17 Aug 2015) Changed paths: M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.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/ConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassCluster.java 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-rest-tests/src/test/groovy/org/hawkular/alerts/rest/DampeningITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy Log Message: ----------- Merge pull request #80 from jshaughn/hwkalerts-74 Hwkalerts 74 Compare: https://github.com/hawkular/hawkular-alerts/compare/2a4ab9789d5c...ed3ef8...