[Hawkular-commits] [hawkular/hawkular-alerts] 63197a: WIP - Not ready for anything yet...

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: 63197a68735e84ffe00569da0aabb565f3ff1abd https://github.com/hawkular/hawkular-alerts/commit/63197a68735e84ffe00569... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalCondition.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalConditionEval.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/main/java/org/hawkular/alerts/engine/impl/CassStatement.java M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl A hawkular-alerts-metrics/.gitignore A hawkular-alerts-metrics/pom.xml A hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/log/MsgLogger.java A hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Expression.java A hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java A hawkular-alerts-metrics/src/main/webapp/WEB-INF/beans.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-ejb3.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-web.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/web.xml A hawkular-alerts-metrics/src/main/webapp/index.jsp Log Message: ----------- WIP - Not ready for anything yet... Commit: 49b863cc745327b08c56e637d6d7f80978c0564f https://github.com/hawkular/hawkular-alerts/commit/49b863cc745327b08c56e6... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonJacksonTest.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-metrics/pom.xml M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/log/MsgLogger.java M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Expression.java M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java A hawkular-alerts-metrics/src/test/java/org/hawkular/alerts/external/metrics/ExpressionTest.java M pom.xml Log Message: ----------- HWKALERTS-50 WIP - initial code handling just avg, using a local metrics snapshot not yet tested Commit: a20bf3faabf660274f09fc395154653b40c1a804 https://github.com/hawkular/hawkular-alerts/commit/a20bf3faabf660274f09fc... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsEvent.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/CacheManager.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/AvailDataListener.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.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/RulesEngineTest.java M hawkular-alerts-metrics/pom.xml M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/log/MsgLogger.java M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java A hawkular-alerts-metrics/src/main/resources/META-INF/beans.xml R hawkular-alerts-metrics/src/main/webapp/WEB-INF/beans.xml R hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-ejb3.xml R hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-web.xml R hawkular-alerts-metrics/src/main/webapp/WEB-INF/web.xml R hawkular-alerts-metrics/src/main/webapp/index.jsp M hawkular-alerts-rest-tests/pom.xml A hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/external/AbstractExternalITestBase.groovy A hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- hkwalerts-50,52 still a work in progress, fails to deploy correctly - add more granularity to Definitions Events and improve listeners - finished adding ExternalCondition handling throughout the code - restructured Manager to be more elegant when handling changes to the Trigger population. - added -Pexternal for itests - quiet down some verbose logging in the DataListeners - change to jar packaging for new metrics module (from war) - removed docgen stuff from new metrics module - Added ExternalMetricsITest to test the new integration - TODO: added beans.xml to hawkular-alerts-metrics jar but it may be unnecessary. - TODO: make sure -Pexternal and -Prest-only are mutually exclusive Commit: 2bb9a1c10f6b975b79cde7a7aa3a6b6031a7f3b6 https://github.com/hawkular/hawkular-alerts/commit/2bb9a1c10f6b975b79cde7... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalCondition.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 A hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/CassCluster.java M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java A hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/MetricsServiceProducer.java M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy Log Message: ----------- HWKALERTS-50 work continuing, not yet working... - added a Producer for finally getting a MetricsService injected into the alerts-metrics Manager. And finally got a session started for the hawkular_metrics keyspace. - required a tweak to metrics core to create a session that does not try to install the schema. - figure out how to establish a local MetricsSession for the hawular_metrics - fix bug in fetching triggers by tags cross-tenant - fix issue in ExternalCondition constructor - fix persistence issue - add ExternalCondition handling to setConditions/insert - TODO: overloading condition.operator, pattern. Should we add explicit fields to the schema? - fix issue in test, needed to tag the test trigger as a metrics-trigger. - make the Manager bean @startup so that it gets created immediately, registers its listener and starts looking for expressions to process. Commit: c9fea6e8d57c816edc8e002c300c9ae075834607 https://github.com/hawkular/hawkular-alerts/commit/c9fea6e8d57c816edc8e00... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy Log Message: ----------- HWKALERTS-50, 52 1st working test for func avg! - fix systemId expectation on the ExternalCondition - fix time range (period in minutes, not seconds) - interact better with rxjava by using BlockingObservable to ensure work is done before the Runnable exits. - add the rest of the expression funcs (not tested) - fix test so data does not overlap on consecutive runs - make sure to inject data before the trigger is enabled Commit: 6a2d7ccc265ccbeaef68a1b784bff0e71176fe5a https://github.com/hawkular/hawkular-alerts/commit/6a2d7ccc265ccbeaef68a1... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Expression.java M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java M hawkular-alerts-metrics/src/test/java/org/hawkular/alerts/external/metrics/ExpressionTest.java M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy Log Message: ----------- HWKALERTS-50 remove avgdp and avgwp functions - the avgd/avgw functions were somewhat redundant with avgdp/avgwp so for simplicity just make avgd/avgw percentage-based and remove avgdp/avgwp - add test for avgd, more to come Commit: c287774cacc067d66951a59d7645e4a5b3b59362 https://github.com/hawkular/hawkular-alerts/commit/c287774cacc067d66951a5... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassDefinitionsTest.java M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Expression.java M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java M hawkular-alerts-metrics/src/test/java/org/hawkular/alerts/external/metrics/ExpressionTest.java M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy Log Message: ----------- HWKALERTS-50 tests complete and passing - added tests for the remaining single-metric functions - fixed tests to avoid conflicting with data left from prior tests - renamed functions delta/deltap to range/rangep which was more clear to jsanda and I think is the more standard math term for what they do. - fixed the rxjava client side fetching range data from metrics TODO: cleanup Commit: 5472ef54bcb1abbf7c6b3274acd2380510d294e7 https://github.com/hawkular/hawkular-alerts/commit/5472ef54bcb1abbf7c6b32... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalCondition.java A hawkular-alerts-ear/src/main/application/META-INF/jboss-all.xml M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java M hawkular-alerts-metrics/src/test/java/org/hawkular/alerts/external/metrics/ExpressionTest.java M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy Log Message: ----------- HWKALERTS-50, 52 misc - make sure to do an initial load of metrics trigger conditions - fix tests using old func name - add a deployment dep on hawkular-metrics-api-jaxrs.war to ensure merics is ready/schema is created before trying to connect. - quiet logging Commit: 0491087b97dcc4f99902816f3bdbd1f58aba7021 https://github.com/hawkular/hawkular-alerts/commit/0491087b97dcc4f9990281... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/MetricsServiceProducer.java Log Message: ----------- Update to new API Commit: 58d3d46553c4b7f08222ecbe035dbcf5bfc94693 https://github.com/hawkular/hawkular-alerts/commit/58d3d46553c4b7f08222ec... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-rest-tests/pom.xml Log Message: ----------- exclude external itests from -Prest[-only] in anticipation of these tests breaking out into a separate module for the external alerting component (aka alerts-metrics) Commit: f4b042d90fb9c982299790d6053bce52386fb250 https://github.com/hawkular/hawkular-alerts/commit/f4b042d90fb9c982299790... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-metrics/pom.xml Log Message: ----------- make sure new module has the correct version when merged to master Commit: 18c30ef7c293f29c09d4e6c5a6c96d4fc44b520b https://github.com/hawkular/hawkular-alerts/commit/18c30ef7c293f29c09d4e6... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M hawkular-alerts-metrics/pom.xml M pom.xml Log Message: ----------- Fix versioning for metrics deps Commit: 5bc3d7f2dfff6be85452ee809fb128f2d6c81550 https://github.com/hawkular/hawkular-alerts/commit/5bc3d7f2dfff6be85452ee... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: R hawkular-alerts-ear/src/main/application/META-INF/jboss-all.xml M hawkular-alerts-metrics/pom.xml M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java R hawkular-alerts-metrics/src/main/resources/META-INF/beans.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/beans.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-all.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-web.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/web.xml A hawkular-alerts-metrics/src/main/webapp/index.jsp A hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/AbstractExternalITestBase.groovy A hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy M hawkular-alerts-rest-tests/pom.xml R hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/external/AbstractExternalITestBase.groovy R hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy R hawkular-alerts-rest/src/main/webapp/WEB-INF/beans.xml M pom.xml Log Message: ----------- HWKALERTS-50 Rebase on master (hwkalerts-57, 17) - Finally get external alerter to be its own (war) deployment - remove hawkular-alerts-metrics-ear - package hawkular-alerts-metrics as war instead of ear - Move external alerter itests from alerts-rest-tests to alerts-metrics - change exe profile from -Pexternal to -Pitest - remove unnecessary beans.xml from alerts-rest - add beans.xml to alerter war, note that 'all' discovery mode is required - add jboss-all.xml to alerter war to ensure deployment after co-located metrics Commit: 1ee414dadb8f70a8254a6cd03284bfb8651de21e https://github.com/hawkular/hawkular-alerts/commit/1ee414dadb8f70a8254a6c... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-07-03 (Fri, 03 Jul 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalCondition.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsEvent.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonJacksonTest.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/CacheManager.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/AvailDataListener.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.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/org/hawkular/alerts/engine/rules/ConditionMatch.drl M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassDefinitionsTest.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java A hawkular-alerts-metrics/.gitignore A hawkular-alerts-metrics/pom.xml A hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/log/MsgLogger.java A hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/CassCluster.java A hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Expression.java A hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java A hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/MetricsServiceProducer.java A hawkular-alerts-metrics/src/main/webapp/WEB-INF/beans.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-all.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-web.xml A hawkular-alerts-metrics/src/main/webapp/WEB-INF/web.xml A hawkular-alerts-metrics/src/main/webapp/index.jsp A hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/AbstractExternalITestBase.groovy A hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy A hawkular-alerts-metrics/src/test/java/org/hawkular/alerts/external/metrics/ExpressionTest.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java R hawkular-alerts-rest/src/main/webapp/WEB-INF/beans.xml M pom.xml Log Message: ----------- Merge pull request #63 from jshaughn/hwkalerts-50 Hwkalerts 50 Compare: https://github.com/hawkular/hawkular-alerts/compare/db859fbb2754...1ee414...