[Hawkular-commits] [hawkular/hawkular-alerts] 86e78e: [HWKALERTS-2] Initial support for Trigger Safety M...

Jay Shaughnessy jshaughn at redhat.com
Wed Feb 25 17:57:37 EST 2015


  Branch: refs/heads/jshaughn/api
  Home:   https://github.com/hawkular/hawkular-alerts
  Commit: 86e78ed9f6e21bf67cc24ac7ab205a74facb1c69
      https://github.com/hawkular/hawkular-alerts/commit/86e78ed9f6e21bf67cc24ac7ab205a74facb1c69
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    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/AvailabilityConditionEval.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/CompareConditionEval.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/StringCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringConditionEval.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/ThresholdConditionEval.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/condition/ThresholdRangeConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.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/model/trigger/TriggerTemplate.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.data
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/dampening.data
    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/RulesEngineTest.java

  Log Message:
  -----------
  [HWKALERTS-2] Initial support for Trigger Safety Mode
A Trigger can now be in FIRE mode or SAFETY mode. A Condition set and
Dampening can be defined for both modes on the same Trigger. Based on the
Trigger's current mode the relevant conditions and dampening will be used
for evaluations.
- introduce trigger mode across the various constructor/hashcode/equals/toStrings
- add safetyEnabled to indicate that safety conditions are set and enabled
- make ConditionEval.getLog() impls more verbose w/ timestamp info
- update the DB and File def service impls as needed
- add test code

ToDo: Currently satisfying the safety dampening only toggles the Trigger
      back to fire mode.  We need to discuss whether we should be generating
      an alert and/or performing actions.


  Commit: 0494d8d9792f7c5fdba644016ac372ac17310afb
      https://github.com/hawkular/hawkular-alerts/commit/0494d8d9792f7c5fdba644016ac372ac17310afb
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    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/dampening/Dampening.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/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy

  Log Message:
  -----------
  [HWKALERTS-2] rebase on master, fix test failures


  Commit: 88b714306d5b0821a94ac48b1c25f856598a3542
      https://github.com/hawkular/hawkular-alerts/commit/88b714306d5b0821a94ac48b1c25f856598a3542
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

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

  Log Message:
  -----------
  [HWKALERTS-2] use trigger mode name as opposed to ordinal in Condition id.


  Commit: 104e158946c319e12103083cc31bfdd4a55927b5
      https://github.com/hawkular/hawkular-alerts/commit/104e158946c319e12103083cc31bfdd4a55927b5
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/CompareConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java

  Log Message:
  -----------
  Fix some potential NPE's in debug logging.


  Commit: 3669fb4f7c2fab93b7e60ce201d853d930fbd88d
      https://github.com/hawkular/hawkular-alerts/commit/3669fb4f7c2fab93b7e60ce201d853d930fbd88d
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.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/model/trigger/TriggerTemplate.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.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/BasicAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java
    R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/rules/RulesEngine.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java
    M 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
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifiersHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java

  Log Message:
  -----------
  Potential model, API revisions for review (branched off trigger safety PR)
** work in progress, compiling only **

- fix up some equals/hashcode logic
  - use Trigger.triggerId as unique key
    - make TriggerTemplate abstract and set match fields as transient
  - give Dampening a unique key: dampeningId

- Introduce trigger-granular reload so that changes to a trigger don't
  force a global reload but just a reload of the affected trigger.
  - add support in RulesEngine for get/removeFacts

- Various changes to definitions service
  - move torwards a more trigger-centric model
    - support full conditionSet replacement
  - introduce triggerMode into the api
  - use dampening's unique key
  - add jdoc

- DB table changes
  - introduce dampeningId into the tables
  - introduce triggerMode into the tables

- remove MemDefinitionsServiceImpl


Compare: https://github.com/hawkular/hawkular-alerts/compare/86e78ed9f6e2^...3669fb4f7c2f


More information about the hawkular-commits mailing list