[Hawkular-commits] [hawkular/hawkular-alerts] 69ab73: HWKALERTS-12 introduce parent/child fields, refact...
Lucas Ponce
ponce.ballesteros at gmail.com
Mon Aug 31 04:17:16 EDT 2015
Branch: refs/heads/master
Home: https://github.com/hawkular/hawkular-alerts
Commit: 69ab73377354251828cba9717629817dab88f119
https://github.com/hawkular/hawkular-alerts/commit/69ab73377354251828cba9717629817dab88f119
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths:
M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailPluginTest.java
M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.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/AvailabilityCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
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/StringCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Match.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Mode.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
R 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/DefinitionsService.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/resources/hawkular-alerts-schema.cql
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-rest-tests/src/test/groovy/org/hawkular/alerts/rest/DampeningITest.groovy
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
Log Message:
-----------
HWKALERTS-12 introduce parent/child fields, refactor enums, kill TriggerTemplate
Commit: 9294327626d18abd2c0ce1c61c083f35dcda4b9c
https://github.com/hawkular/hawkular-alerts/commit/9294327626d18abd2c0ce1c61c083f35dcda4b9c
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths:
M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.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/JsonTest.java
A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/exception/NotFoundException.java
M 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/CassDefinitionsServiceImpl.java
M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
Log Message:
-----------
HWKALERTS-12 Parent Triggers
- Update the DefinitionsService for parent trigger support
- Add new methods
- Update existing method jdoc with behavior for parent
triggers, where relevant
- Initial impl for parent/child support
- *API CHANGE* Move tenantId into Trigger constructors. It really should
be there because it is client-supplied and a required part of the
definition. Continue to leave it out of Condition/Dampening constructors
as the tenantId can be assumed from the owning trigger.
- Add new NotFoundException to be used as needed. In many places it can
prevent the need for an existence pre-fetch in the rest handler code.
Commit: 2c904036a689a347386080f1fdae011b49307d3e
https://github.com/hawkular/hawkular-alerts/commit/2c904036a689a347386080f1fdae011b49307d3e
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths:
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java
Log Message:
-----------
- Fix imports after rebase
- Fix test failure (problem in test)
Commit: 449abbe6e0d19e9d8ad937a4880201595e98bd9f
https://github.com/hawkular/hawkular-alerts/commit/449abbe6e0d19e9d8ad937a4880201595e98bd9f
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths:
M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailPluginTest.java
M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java
M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.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/exception/NotFoundException.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/hawkular-alerts-schema.cql
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy
M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy
M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
Log Message:
-----------
HWKALERTS-12 Add rest endpoints
- fix trigger constructors for rest clients
- fix queries
- make NotFoundException an ApplicationException to avoid wrapping as EjbException
- update triggers schema
Commit: 8ed5f248828d8d030c7a756148c7573c8cb2a15e
https://github.com/hawkular/hawkular-alerts/commit/8ed5f248828d8d030c7a756148c7573c8cb2a15e
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2015-08-27 (Thu, 27 Aug 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/model/trigger/Trigger.java
M 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/CassDefinitionsServiceImpl.java
M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassDefinitionsTest.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions-data.json
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening-data.json
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
Log Message:
-----------
HWKALERTS-12 Add Tests
- Add some Parent trigger tests (more to come)
- Change Alert/Trigger.getContext() to return nonNull. This is more
compastible with the way json rows return map fields.
- Relax reload of parent triggers, just skip them instead of throwing
exception. This simplifies the calling code.
- Fix issues running CassDefinitionsTest with external cassandra, and
fix alert cleanup.
- Fix several bugs and add more error checking
Commit: 5165fbf3d22ca0eafe2b779bb8b37bab9ca2007a
https://github.com/hawkular/hawkular-alerts/commit/5165fbf3d22ca0eafe2b779bb8b37bab9ca2007a
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths:
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/hawkular-alerts-schema.cql
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions-data.json
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassDefinitionsTest.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions-data.json
M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions-data.json
M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json
Log Message:
-----------
HWKALERTS-12 support for parent condition and parent dampening changes
- provide add/update/remove support for parent conditions and dampening.
- provide ew addParentCondition. When adding a condition to a parent
trigger it is necessary to provide all of the dataId mapping information
for existing child triggers, so a specific method was needed,
the existing addCondition() is insufficient.
- add appropriate tests and fix some test cleanup issues
- fix issue in conditions schema, remove type from primary key. It is
unnecessary for uniqueness or queries, and messed up ordering on selects. We want
trigger conditions to come back in ascending conditionSetIndex order. That
allows us to maintain condition ordering on condition updates for
multi-condition triggers. natural clustering key ordering now gives us
this because the conditionId provides the necessary ordering.
- fix issue in condition json files, wrong field name in threshold conditions
Commit: 0b6c4a0db0e853c04a2fa5661fe69cf32dff9a2d
https://github.com/hawkular/hawkular-alerts/commit/0b6c4a0db0e853c04a2fa5661fe69cf32dff9a2d
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths:
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/MemberCondition.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/MemberTrigger.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/Match.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Mode.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.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/AlertsEngineImpl.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/hawkular-alerts-schema.cql
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/dampening-data.json
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
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/dampening-data.json
M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
Log Message:
-----------
HWKALERTS-12 refactor parent/child to group/member
- require group operations to use add explicit group-level api calls.
Although it can be a bit of a pain, it allows for clearer code, better
exception checking, and better supports the REST API.
- Add MemberCondition and MemberTrigger json DTO classes
- Leverage ConditionSerializer in TriggersHandler
- Add rest API test code for new group endpoints (** WIP **)
- fix: add tenant to the generated alertIds for uniqueness
- fix: add conditionSetSize/Index in ConditionDeserializer. These are
important fields.
- fix: author spelling issues
Commit: 8cdbea8b98093e7fb47114e07e4a82032b18226f
https://github.com/hawkular/hawkular-alerts/commit/8cdbea8b98093e7fb47114e07e4a82032b18226f
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths:
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.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-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/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
Log Message:
-----------
HWKALERTS-12 Finish rest API and tests
- Added findGroupMembers: GET "/alerts/triggers/groups/{groupId}/members"
- Fix: Bug in tag deletion where tables were left in inconsistent state.
simplified deletion (may need perf enhance in the future).
- Fix: Ensure group triggers have group flag set to true
- Fix: API CHANGE: change delete[Group]Tags from POST to PUT
- Fix: API CHANGE: change /resolve, /ack from GET to PUT
Commit: 24eec7cd0018ac263874e366732f36cc4ff2540e
https://github.com/hawkular/hawkular-alerts/commit/24eec7cd0018ac263874e366732f36cc4ff2540e
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths:
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/CassDefinitionsServiceImpl.java
Log Message:
-----------
HKWALERTS-12 fix master rebase issues
Commit: 037f81dd71942e1f10cd987bfe023fb8bcd9f603
https://github.com/hawkular/hawkular-alerts/commit/037f81dd71942e1f10cd987bfe023fb8bcd9f603
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2015-08-28 (Fri, 28 Aug 2015)
Changed paths:
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/exception/NotFoundException.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GroupConditionInfo.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GroupMemberInfo.java
R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/MemberCondition.java
R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/MemberTrigger.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/UnorphanMemberInfo.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/exception/NotFoundApplicationException.java
R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/exception/NotFoundException.java
M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy
M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
Log Message:
-----------
HWKALERTS-12 Incorporate PR Feedback
- also, fix issue in ExternalMetricsItest
Commit: f559959a197a7b731dfaa7c4d51688f67f65d0ab
https://github.com/hawkular/hawkular-alerts/commit/f559959a197a7b731dfaa7c4d51688f67f65d0ab
Author: Lucas Ponce <ponce.ballesteros at gmail.com>
Date: 2015-08-31 (Mon, 31 Aug 2015)
Changed paths:
M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailPluginTest.java
M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java
M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/exception/NotFoundException.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GroupConditionInfo.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GroupMemberInfo.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/UnorphanMemberInfo.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/condition/AvailabilityCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
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/StringCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Match.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Mode.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
R 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/DefinitionsService.java
M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/exception/NotFoundApplicationException.java
M 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/CassDefinitionsServiceImpl.java
M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions-data.json
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/dampening-data.json
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
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/DefinitionsTest.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions-data.json
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening-data.json
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy
M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy
M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/DampeningITest.groovy
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/conditions-data.json
M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/dampening-data.json
M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
Log Message:
-----------
Merge pull request #85 from jshaughn/hwkalerts-12
Thanks for the PR changes.
Compare: https://github.com/hawkular/hawkular-alerts/compare/ad4d4b680302...f559959a197a
More information about the hawkular-commits
mailing list