[Hawkular-commits] [hawkular/hawkular-alerts] 590012: HWKALERTS-24 Refactoring of notifications

Jay Shaughnessy jshaughn at redhat.com
Tue Mar 17 10:16:27 EDT 2015


  Branch: refs/heads/winter/uuid
  Home:   https://github.com/hawkular/hawkular-alerts
  Commit: 590012aa13d2db04dc85c59c04acb56b805e60c2
      https://github.com/hawkular/hawkular-alerts/commit/590012aa13d2db04dc85c59c04acb56b805e60c2
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    A hawkular-actions-email/src/main/webapp/index.jsp~HEAD
    A hawkular-actions-email/src/main/webapp/index.jsp~HWKALERTS-24 Refactoring of notifications
    A hawkular-actions-sms/src/main/webapp/index.jsp~5ee0a13331f45d249bfbafda2fdb6b5a181828fa
    A hawkular-actions-sms/src/main/webapp/index.jsp~HEAD
    A hawkular-actions-snmp/src/main/webapp/index.jsp~HEAD
    A hawkular-actions-snmp/src/main/webapp/index.jsp~HEAD_0
    A hawkular-actions-snmp/src/main/webapp/index.jsp~HWKALERTS-24 Refactoring of notifications
    A hawkular-actions-snmp/src/main/webapp/index.jsp~HWKALERTS-24 Refactoring of notifications_0

  Log Message:
  -----------
  HWKALERTS-24 Refactoring of notifications


  Commit: d6bfbedf3d6dd07d2f75e616cce1e10a4f6fb2b4
      https://github.com/hawkular/hawkular-alerts/commit/d6bfbedf3d6dd07d2f75e616cce1e10a4f6fb2b4
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-rest/pom.xml
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/CompareConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy
    A hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/StringConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ThresholdConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ThresholdRangeConditionsTest.groovy

  Log Message:
  -----------
  Update REST endpoints to new API


  Commit: a87741dd8505a4014782cbc1c7a280287154b253
      https://github.com/hawkular/hawkular-alerts/commit/a87741dd8505a4014782cbc1c7a280287154b253
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    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/test/groovy/org/hawkular/alerts/rest/ActionsTest.groovy

  Log Message:
  -----------
  Fix some notifier wording for actions


  Commit: 3648172484ee7927abb082ae924cfe6c95deab31
      https://github.com/hawkular/hawkular-alerts/commit/3648172484ee7927abb082ae924cfe6c95deab31
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy

  Log Message:
  -----------
  Refactor dampening rest endpoint


  Commit: 2a44ad3cece0e0030b4b6d27bcc8c8160c6b1ed7
      https://github.com/hawkular/hawkular-alerts/commit/2a44ad3cece0e0030b4b6d27bcc8c8160c6b1ed7
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy

  Log Message:
  -----------
  Missing conditionId used for REST endpoints


  Commit: 2d68ee013281c36d8a9d47325509dc7d44538c60
      https://github.com/hawkular/hawkular-alerts/commit/2d68ee013281c36d8a9d47325509dc7d44538c60
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

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

  Log Message:
  -----------
  Fix action plugins query


  Commit: ac89f1490cc28093cee548096e910357c544c78b
      https://github.com/hawkular/hawkular-alerts/commit/ac89f1490cc28093cee548096e910357c544c78b
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    R hawkular-actions-email/src/main/webapp/index.jsp
    R hawkular-actions-snmp/src/main/webapp/index.jsp
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java

  Log Message:
  -----------
  HWKALERTS-24 Refactoring of notifications


  Commit: 174dfc816cab089890bc34244ac2975425d395e5
      https://github.com/hawkular/hawkular-alerts/commit/174dfc816cab089890bc34244ac2975425d395e5
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl

  Log Message:
  -----------
  Add Json anotations into API model


  Commit: 4d205b75d9460f563e8ef1f464c24e81c570eab7
      https://github.com/hawkular/hawkular-alerts/commit/4d205b75d9460f563e8ef1f464c24e81c570eab7
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java

  Log Message:
  -----------
  Fix merge issues due to rebase wintermute.


  Commit: a2476cf1195b819dec06a1d3404bf56b0f72db16
      https://github.com/hawkular/hawkular-alerts/commit/a2476cf1195b819dec06a1d3404bf56b0f72db16
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java

  Log Message:
  -----------
  Merge branch 'winter/uuid' of github.com:hawkular/hawkular-alerts into winter/uuid

Conflicts:
	examples/example-alerts-ui/src/main/webapp/index.jsp
	hawkular-actions-email/src/main/webapp/index.jsp
	hawkular-actions-email/src/main/webapp/index.jsp~HEAD
	hawkular-actions-email/src/main/webapp/index.jsp~HWKALERTS-24 Refactoring of notifications
	hawkular-actions-sms/src/main/webapp/index.jsp
	hawkular-actions-snmp/src/main/webapp/index.jsp
	hawkular-actions-snmp/src/main/webapp/index.jsp~HEAD
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
	hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
	hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
	hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
	hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
	hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
	hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy
	hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
	hawkular-notifiers-email/src/main/webapp/index.jsp
	hawkular-notifiers-sms/src/main/webapp/index.jsp
	hawkular-notifiers-snmp/src/main/webapp/index.jsp


Compare: https://github.com/hawkular/hawkular-alerts/compare/5ee0a13331f4...a2476cf1195b


More information about the hawkular-commits mailing list