[Hawkular-commits] [hawkular/hawkular-alerts] fe6cee: [HKWALERTS-53] Add severity to Triggers and Alerts

Jay Shaughnessy jshaughn at redhat.com
Fri Jun 5 17:28:41 EDT 2015


  Branch: refs/heads/master
  Home:   https://github.com/hawkular/hawkular-alerts
  Commit: fe6cee6502c58f5091f8330f75829cd4bfef9c0a
      https://github.com/hawkular/hawkular-alerts/commit/fe6cee6502c58f5091f8330f75829cd4bfef9c0a
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/Severity.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/trigger/TriggerTemplate.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.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/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data
    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/DefinitionsTest.java
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data
    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/TriggersITest.groovy
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers.data
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java

  Log Message:
  -----------
  [HKWALERTS-53] Add severity to Triggers and Alerts
Adds RTGov-style severities to Trigger definitions: User can set one of
Low, Medium (default), High, Critical.  Alerts generated by the Trigger
inherit the assigned severity.  Alert fetch offers severity filtering.
Trigger severity can be updated, but alert severity is immutable.

TODO (if needed): Alert severity filter support in RDB impl.


  Commit: ed67c7f417a333e78f99003c6356715a951aafca
      https://github.com/hawkular/hawkular-alerts/commit/ed67c7f417a333e78f99003c6356715a951aafca
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java

  Log Message:
  -----------
  [HKWALERTS-53] Add severity to Triggers and Alerts
- Add support for RDB backend


  Commit: 279dd0c115d22f4c440ac03683bee4457ef00992
      https://github.com/hawkular/hawkular-alerts/commit/279dd0c115d22f4c440ac03683bee4457ef00992
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java

  Log Message:
  -----------
  Add missing tenantId field to query


  Commit: 2dc42c94a389297bb8098ab976537384cdbcccc9
      https://github.com/hawkular/hawkular-alerts/commit/2dc42c94a389297bb8098ab976537384cdbcccc9
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M .travis.swagger.sh
    M hawkular-actions-api/pom.xml
    M hawkular-actions-plugins/hawkular-actions-aerogear/pom.xml
    M hawkular-actions-plugins/hawkular-actions-email/pom.xml
    M hawkular-actions-plugins/hawkular-actions-pagerduty/pom.xml
    M hawkular-actions-plugins/hawkular-actions-sms/pom.xml
    M hawkular-actions-plugins/hawkular-actions-snmp/pom.xml
    M hawkular-actions-plugins/pom.xml
    M hawkular-alerts-api/pom.xml
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java
    M hawkular-alerts-bus/pom.xml
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/AlertDataListener.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-ear/pom.xml
    M hawkular-alerts-engine/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/StandaloneAlerts.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertProperties.java
    A 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/CassCluster.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/AlertsEngine.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsTest.java
    M hawkular-alerts-rest-tests/pom.xml
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy
    R hawkular-alerts-rest-tests/src/test/resources/hawkular-realm-patch.json
    R hawkular-alerts-rest-tests/src/test/resources/standalone.xsl
    M hawkular-alerts-rest/pom.xml
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ResponseUtil.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
    A hawkular-alerts-rest/src/main/webapp/WEB-INF/jboss-ejb3.xml
    M pom.xml

  Log Message:
  -----------
  Merge branch 'master' of github.com:hawkular/hawkular-alerts into jshaughn/severity

Conflicts:
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java


  Commit: 771618b14bf05d0e651f21b662f403a0924376dc
      https://github.com/hawkular/hawkular-alerts/commit/771618b14bf05d0e651f21b662f403a0924376dc
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy

  Log Message:
  -----------
  - Fix some queries that didn't get updated in the merge.
- Add some negative query tests for alert severity and status


  Commit: bc529112ab0065c278f15f0d062f14ad3de1da1c
      https://github.com/hawkular/hawkular-alerts/commit/bc529112ab0065c278f15f0d062f14ad3de1da1c
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

  Changed paths:
    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/services/AlertsCriteria.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
    M pom.xml

  Log Message:
  -----------
  Merge branch 'master' of github.com:hawkular/hawkular-alerts into jshaughn/severity

Conflicts:
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java


  Commit: 894959700587430ebdd46bf14072bfc32ede68b4
      https://github.com/hawkular/hawkular-alerts/commit/894959700587430ebdd46bf14072bfc32ede68b4
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

  Changed paths:
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/Severity.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/trigger/TriggerTemplate.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.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/CassStatement.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data
    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/DefinitionsTest.java
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data
    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/TriggersITest.groovy
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers.data
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java

  Log Message:
  -----------
  Merge pull request #55 from jshaughn/jshaughn/severity

Jshaughn/severity


Compare: https://github.com/hawkular/hawkular-alerts/compare/8dee6bcd31a5...894959700587


More information about the hawkular-commits mailing list