Branch: refs/heads/1.8.x Home: https://github.com/hawkular/hawkular-alerts Commit: c98e07e539f5a6e11250636fdd147d4418065f82 https://github.com/hawkular/hawkular-alerts/commit/c98e07e539f5a6e1125063... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2017-10-13 (Fri, 13 Oct 2017) Changed paths: A hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-itest/pom.xml A hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-itest/src/test/groovy/org/hawkular/alerter/prometheus/PrometheusITest.groovy A hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-itest/src/test/resources/application-roles.properties A hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-itest/src/test/resources/application-users.properties A hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-itest/src/test/resources/prometheus-alert-trigger.json A hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-itest/src/test/resources/prometheus-alerts.rules A hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-itest/src/test/resources/prometheus-group-trigger.json A hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-itest/src/test/resources/prometheus-query-trigger.json A hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-itest/src/test/resources/standalone-hawkular.xsl M hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-lib/pom.xml M hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-lib/src/main/java/org/hawkular/alerter/prometheus/ConditionManager.java R hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-lib/src/main/resources/log4j2.xml R hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-lib/src/test/groovy/org/hawkular/alerter/prometheus/PrometheusITest.groovy M hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-lib/src/test/java/org/hawkular/alerter/prometheus/PrometheusQueryTest.java R hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-lib/src/test/resources/log4j2.xml R hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-lib/src/test/resources/prometheus-alert-trigger.json R hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-lib/src/test/resources/prometheus-alerts.rules R hawkular-alerters/hawkular-prometheus-alerter/hawkular-prometheus-alerter-lib/src/test/resources/prometheus-query-trigger.json M hawkular-alerters/hawkular-prometheus-alerter/pom.xml M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalCondition.java Log Message: ----------- Prometheus Alerter Group Trigger Support - Support tokenized expressions so that member triggers can customize the promql expression string. Tokens are supplied as additional context on the member. - Add itest module and fix up all tests - Add -Pprometheus to run both unit and itests - requires a P running on default ports, and some other Also: - Enable prometheus alerter by default - Fix some doco in ExternalCondition