[Hawkular-commits] [hawkular/hawkular-alerts] b616a4: HWKALERTS-186 Protect REST endpoints from tags wit...

Branch: refs/heads/1.3.x Home: https://github.com/hawkular/hawkular-alerts Commit: b616a41564c812c8d74314f353ffbdba5c8d1ac9 https://github.com/hawkular/hawkular-alerts/commit/b616a41564c812c8d74314... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M hawkular-alerts-rest/hawkular-alerts-rest-api/src/main/java/org/hawkular/alerts/rest/EventsHandler.java M hawkular-alerts-rest/hawkular-alerts-rest-api/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- HWKALERTS-186 Protect REST endpoints from tags with null values (#240) Commit: b3c91b2a76449c7827ff86ab502c779b2a1d7f3e https://github.com/hawkular/hawkular-alerts/commit/b3c91b2a76449c7827ff86... Author: jshaughn <jshaughn(a)localhost.localdomain&gt; Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M hawkular-alerts-engine/pom.xml R hawkular-alerts-engine/src/main/resources/META-INF/maven/pom.properties M hawkular-alerts-rest/deployments/hawkular-alerts-rest-metrics/pom.xml R hawkular-alerts-rest/deployments/hawkular-alerts-rest-metrics/src/main/webapp/WEB-INF/jboss-deployment-structure.xml M hawkular-alerts-rest/deployments/hawkular-alerts-rest-services/pom.xml R hawkular-alerts-rest/deployments/hawkular-alerts-rest-services/src/main/webapp/WEB-INF/jboss-deployment-structure.xml Log Message: ----------- Thin Artifacts - remove jboss-deployment-structure.xml for wars being packaged inside metrics ear, they are overridden at the ear level. - exclude cassandra-driver-core (and transitive deps) from services war, it is provided by the hawkular commons module. - exclude commons-codec from alerts-rest-metrics/services wars, it can conflict with the metrics war and seems to be an unused transitive dep. - remove an unexpected pom.properties file from engine jar META-INF Commit: 52d696ad5247c80a7a9120cf03f55a7eb92e77d4 https://github.com/hawkular/hawkular-alerts/commit/52d696ad5247c80a7a9120... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/IncomingDataManager.java Log Message: ----------- Introducing IncomingDataManager (#244) Using ManagedExecutorService for IncomingDataManager Sending events in async buffer Commit: e2e5f890d1229b6cd30f1e4b04475d1bfe1dc456 https://github.com/hawkular/hawkular-alerts/commit/e2e5f890d1229b6cd30f1e... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DataDrivenGroupCacheManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/PartitionManagerImpl.java Log Message: ----------- - Improvements to DataDrivenGroupCacheManager and PartitionManagerImpl - increase timeout when updating cache/changing topology so that waiting calls don't timeout. - apply READ locks where possible, to reduce waiting - Synchronization fix. Method level synchronization syncs on 'this' but we need to consistently sync on pendingData/pendingEvents. - make sure we include tenant when comparing Data objects. Commit: 9d02c06549929da962083323e5f984e1328750c9 https://github.com/hawkular/hawkular-alerts/commit/9d02c06549929da9620833... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/PartitionManagerImpl.java Log Message: ----------- Support for multiple listeners in PartitionManagerImpl (#248) Commit: d708476366411fe36fadc0182876196c0615b106 https://github.com/hawkular/hawkular-alerts/commit/d708476366411fe36fadc0... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.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/DataDrivenGroupCacheManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/IncomingDataManager.java A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/IncomingDataManagerImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/PartitionManagerImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/AlertsEngine.java A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/IncomingDataManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/PartitionDataListener.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/PartitionManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/RulesEngine.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java M hawkular-alerts-rest-tests/pom.xml 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/ClusterITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/GroupITest.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/PerfSendITest.groovy Log Message: ----------- HWKALERTS-190 Reduce response time for sendData and improve overall throughput - Enhance IncomingDataManager to perform more up-front async work before passing data on to the engine. - add new minReportingInterval enforcement - Help object creation/GC by using TreeSet pervasively - Fix to make sure Data/Event comparisons involve tenantId and source - Introduce Data.same(other) and Event.same(other) to ensure proper logical comparisons - Fix synchronization in AlertsEngineImpl to avoid downstream ConcurrentModification problems. - Improvements to DataDrivenGroupCacheManager and PartitionManagerImpl - increase timeout when updating cache/changing topology so that waiting calls don't timeout. - apply READ locks where possible, to reduce waiting - Add a bit more more warm up time for cleaner test results - Allow more concurrency by applying LockType.READ on sendData and sendEvents. - while still protecting pendingData/Events with synchronized blocks - Add new hawkular-alerts.data-driven-triggers-enabled option to optionally disable data-driven group triggers, because they add processing overhead (particularly with a lot of trigger manipulation) - default is true (enabled OOB) - disable for perf and cluster tests - Remove annoying and inefficient single Data/Event signatures # Conflicts: # hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java Commit: c14bac075615d4da4cc1e37aee3039ea60c1a314 https://github.com/hawkular/hawkular-alerts/commit/c14bac075615d4da4cc1e3... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsEvent.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/cache/CacheManager.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/DataDrivenGroupCacheManager.java Log Message: ----------- HWKALERTS-191 Prevent excessive cache updates - batch update requests if the cache is already updating - add more context to definition change events - note, unused now but I did the work and it doesn't hurt anything. So, I think we may as well keep it. Commit: 1a4a125a44c0a168d2dec67187628c938c946c75 https://github.com/hawkular/hawkular-alerts/commit/1a4a125a44c0a168d2dec6... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/main/resources/template.html.default_en_US.ftl M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/main/resources/template.plain.default_en_US.ftl M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/test/resources/template.html.default_en_US.ftl M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/test/resources/template.plain.default_en_US.ftl Log Message: ----------- HWKALERTS-192 Full support of Events on email plugin (#253) Commit: 5618758e39995afc0b9720b149d4669565030664 https://github.com/hawkular/hawkular-alerts/commit/5618758e39995afc0b9720... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/IncomingDataManagerImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/RulesEngine.java Log Message: ----------- HWKALERTS-193 Split min-reporting-interval config (#254) Commit: bebbabe414217b1e3a65008bc7b3149076d0b3d8 https://github.com/hawkular/hawkular-alerts/commit/bebbabe414217b1e3a6500... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M hawkular-alerts-rest/deployments/hawkular-alerts-rest-services/pom.xml Log Message: ----------- Package cassandra driver in war for release-branch version. Commit: 9e01984c37aa6f7330286d5b90357b9b73e3d240 https://github.com/hawkular/hawkular-alerts/commit/9e01984c37aa6f7330286d... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/main/resources/template.html.default_en_US.ftl M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/main/resources/template.plain.default_en_US.ftl M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/test/resources/template.html.default_en_US.ftl M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/hawkular-alerts-actions-email-plugin/src/test/resources/template.plain.default_en_US.ftl M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsEvent.java M hawkular-alerts-engine/pom.xml M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/cache/CacheManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.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/DataDrivenGroupCacheManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/IncomingDataManagerImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/PartitionManagerImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/AlertsEngine.java A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/IncomingDataManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/PartitionDataListener.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/PartitionManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/RulesEngine.java R hawkular-alerts-engine/src/main/resources/META-INF/maven/pom.properties M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java M hawkular-alerts-rest-tests/pom.xml 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/ClusterITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/GroupITest.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/PerfSendITest.groovy M hawkular-alerts-rest/deployments/hawkular-alerts-rest-metrics/pom.xml R hawkular-alerts-rest/deployments/hawkular-alerts-rest-metrics/src/main/webapp/WEB-INF/jboss-deployment-structure.xml M hawkular-alerts-rest/deployments/hawkular-alerts-rest-services/pom.xml R hawkular-alerts-rest/deployments/hawkular-alerts-rest-services/src/main/webapp/WEB-INF/jboss-deployment-structure.xml M hawkular-alerts-rest/hawkular-alerts-rest-api/src/main/java/org/hawkular/alerts/rest/EventsHandler.java M hawkular-alerts-rest/hawkular-alerts-rest-api/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- Merge pull request #255 from jshaughn/1.3.x-updates-for-1.3.2 1.3.x updates for 1.3.2 Compare: https://github.com/hawkular/hawkular-alerts/compare/e860102516ea...9e0198...