[Hawkular-commits] [hawkular/hawkular-alerts] b0db3d: Support Hmetrics embedded packaging of Halerting

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: b0db3dd4ad18a23f219b297f88c81872a8ecb7c4 https://github.com/hawkular/hawkular-alerts/commit/b0db3dd4ad18a23f219b29... Author: jshaughn <jshaughn(a)localhost.localdomain&gt; Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook-global/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook-global/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook-global/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook-global/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/ActionPlugins.java M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginListener.java M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginRegister.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java M 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/data/CacheKey.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java R hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/AvailDataMessage.java R hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/MetricDataMessage.java R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/CacheManager.java R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/AvailDataListener.java R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/log/MsgLogger.java A 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/log/MsgLogger.java M hawkular-alerts-metrics/pom.xml 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 R hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/MetricsServiceProducer.java R hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-all.xml R hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-deployment-structure.xml M hawkular-alerts-metrics/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-metrics/src/main/webapp/index.jsp M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/AbstractExternalITestBase.groovy M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy M hawkular-alerts-metrics/src/test/java/org/hawkular/alerts/external/metrics/ExpressionTest.java R hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/BusITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/IntegrationSuite.groovy M hawkular-alerts-rest-tests/src/test/resources/standalone-hawkular.xsl M hawkular-alerts-rest-tests/src/test/resources/standalone.xsl M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java A hawkular-alerts-rest/src/main/webapp/WEB-INF/beans.xml Log Message: ----------- Support Hmetrics embedded packaging of Halerting - update publish/cache mechanism - replace MetricId with CachKey to reduce Ha->Hm dependencies - formalize 'prefix' handling in CacheManager - change cache entry value to the dataId to be sent to Ha - remove Metric Listening via the bus [JMS], metrics are now published directly to alerting. - Ignore ExternalCondition dataIds, they are not metrics-related - move CacheManager from bus to engine to allow publishing outside of Hservices - make the publish cache owned by alerts, not metrics, as alerts decides how it should be populated. - update the metrics external alerter to be deployed in the same EAR as metrics and alerting. - add 'heartbeat' func - remove half-baked group funcs - rename ExternalCondition systemId to alerterId, for clarity - restrict itest to -Pitest-external because it requires an external server setup - fix a bug in DefinitionsService.getAllTriggersByTag. - remove deprecated Condition endpoints from TriggersHandler. It's been long enough and deprecated updateCondition was ambiguously defined with setConditions. After rebasing with "Action Unification" we needed to update some dependencies and JNDI names. Note that updates have been made here assuming that the primary build for alerting is to be used with Hservices (and that Hservices will be using the new Hm EAR, with embedded Alerting). This means that currently ONLY an Hservices deployment will work, the standalone alerting artifact needs some work to: 1) use the standalone versions of the action deployment descriptors 2) use some sort of properties file.configurable method to get the JNDI names Finally, it should be noted that Hm is expected to be deployed as 'hawkular-metrics.ear' for both Hs and Hm-standalone. Commit: 2ab76a3120b0707845698fb0a71240385dd49ba6 https://github.com/hawkular/hawkular-alerts/commit/2ab76a3120b0707845698f... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-09-23 (Fri, 23 Sep 2016) Changed paths: M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook-global/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook-global/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook-global/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook-global/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-all.xml M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/standalone-jboss-all.xml A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/standalone-jboss-deployment-structure.xml M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/ActionPlugins.java M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginListener.java M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginRegister.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java M 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/data/CacheKey.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java R hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/AvailDataMessage.java R hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/MetricDataMessage.java R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/CacheManager.java R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/AvailDataListener.java R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/log/MsgLogger.java A 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/log/MsgLogger.java M hawkular-alerts-metrics/pom.xml 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 R hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/MetricsServiceProducer.java R hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-all.xml R hawkular-alerts-metrics/src/main/webapp/WEB-INF/jboss-deployment-structure.xml M hawkular-alerts-metrics/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-metrics/src/main/webapp/index.jsp M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/AbstractExternalITestBase.groovy M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy M hawkular-alerts-metrics/src/test/java/org/hawkular/alerts/external/metrics/ExpressionTest.java R hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/BusITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/IntegrationSuite.groovy M hawkular-alerts-rest-tests/src/test/resources/standalone-hawkular.xsl M hawkular-alerts-rest-tests/src/test/resources/standalone.xsl M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java A hawkular-alerts-rest/src/main/webapp/WEB-INF/beans.xml Log Message: ----------- Merge pull request #205 from jshaughn/metrics-services Metrics w/ Alerting Compare: https://github.com/hawkular/hawkular-alerts/compare/cfeb25b6edb6...2ab76a...