[hawkular/hawkular-alerts] 853f26: A few possible additions to Wintermute
by Jay Shaughnessy
Branch: refs/heads/wintermute
Home: https://github.com/hawkular/hawkular-alerts
Commit: 853f26351af9a9cedf751f831f8d20d0446d957a
https://github.com/hawkular/hawkular-alerts/commit/853f26351af9a9cedf751f...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)
Changed paths:
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/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/DbDefinitionsServiceImpl.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
Log Message:
-----------
A few possible additions to Wintermute
- provide a default UUID triggerId if a triggerId is not provided. In most
prod cases it seems a generated ID will be desirable. users/apps will likely
not be able to provide a unique ID on their own.
- pull getDataId() down into the Condition base class as it is common to
almost all conditions and makes coding easier.
- Add a copyTrigger to the definitions service. This is experimental, the
idea being to enable using a Tokenized Trigger and generating a bunch
of explicit triggers by provising a map of token dataIds to real dataids.
Commit: ddbc2d1529b2b8e2d6297f9963d1adbe75ebb8c2
https://github.com/hawkular/hawkular-alerts/commit/ddbc2d1529b2b8e2d6297f...
Author: Lucas Ponce <ponce.ballesteros(a)gmail.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
R examples/example-alerts-ui/pom.xml
R examples/example-alerts-ui/src/main/webapp/WEB-INF/jboss-web.xml
R examples/example-alerts-ui/src/main/webapp/WEB-INF/web.xml
R examples/example-alerts-ui/src/main/webapp/index.jsp
A hawkular-actions-api/pom.xml
A hawkular-actions-api/src/main/java/org/hawkular/actions/api/log/MsgLogger.java
A hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionMessage.java
A hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionPluginMessage.java
A hawkular-actions-email/pom.xml
A hawkular-actions-email/src/main/java/org/hawkular/actions/email/listener/EmailListener.java
A hawkular-actions-email/src/main/java/org/hawkular/actions/email/registration/RegistrationInit.java
A hawkular-actions-email/src/main/test/org/hawkular/notifiers/email/notifications/EmailListenerTest.java
A hawkular-actions-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
A hawkular-actions-email/src/main/webapp/WEB-INF/jboss-web.xml
A hawkular-actions-email/src/main/webapp/WEB-INF/web.xml
A hawkular-actions-email/src/main/webapp/index.jsp
A hawkular-actions-sms/pom.xml
A hawkular-actions-sms/src/main/java/org/hawkular/actions/sms/listener/SmsListener.java
A hawkular-actions-sms/src/main/java/org/hawkular/actions/sms/registration/RegistrationInit.java
A hawkular-actions-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
A hawkular-actions-sms/src/main/webapp/WEB-INF/jboss-web.xml
A hawkular-actions-sms/src/main/webapp/WEB-INF/web.xml
A hawkular-actions-sms/src/main/webapp/index.jsp
A hawkular-actions-snmp/pom.xml
A hawkular-actions-snmp/src/main/java/org/hawkular/actions/snmp/listener/SnmpListener.java
A hawkular-actions-snmp/src/main/java/org/hawkular/actions/snmp/registration/RegistrationInit.java
A hawkular-actions-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
A hawkular-actions-snmp/src/main/webapp/WEB-INF/jboss-web.xml
A hawkular-actions-snmp/src/main/webapp/WEB-INF/web.xml
A hawkular-actions-snmp/src/main/webapp/index.jsp
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/notification/Notification.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionListener.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionsService.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/NotificationsService.java
R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/NotifierListener.java
M hawkular-alerts-bus/pom.xml
M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/AlertEngineRegister.java
A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/ActionPluginListener.java
R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/NotifierTypeListener.java
M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/log/MsgLogger.java
A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionSender.java
R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/NotificationSender.java
M hawkular-alerts-ear/pom.xml
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
A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemActionsServiceImpl.java
R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemNotificationsServiceImpl.java
M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/log/MsgLogger.java
A hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data
R hawkular-alerts-engine/src/main/resources/hawkular-alerts/notifiers.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/DbDefinitionsServiceImplTest.java
A hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
R hawkular-alerts-engine/src/test/resources/hawkular-alerts/notifiers.data
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data
A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java
A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotificationHandler.java
R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifierTypeHandler.java
R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifiersHandler.java
A hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ActionsTest.groovy
M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/NotifiersTest.groovy
R hawkular-notifiers-api/pom.xml
R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/log/MsgLogger.java
R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotificationMessage.java
R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotifierRegistrationMessage.java
R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotifierTypeRegistrationMessage.java
R hawkular-notifiers-email/pom.xml
R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/notifications/EmailListener.java
R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/registration/RegisterListener.java
R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/registration/RegistrationInit.java
R hawkular-notifiers-email/src/main/test/org/hawkular/notifiers/email/notifications/EmailListenerTest.java
R hawkular-notifiers-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
R hawkular-notifiers-email/src/main/webapp/WEB-INF/jboss-web.xml
R hawkular-notifiers-email/src/main/webapp/WEB-INF/web.xml
R hawkular-notifiers-email/src/main/webapp/index.jsp
R hawkular-notifiers-sms/pom.xml
R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/notifications/SmsListener.java
R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/registration/RegisterListener.java
R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/registration/RegistrationInit.java
R hawkular-notifiers-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
R hawkular-notifiers-sms/src/main/webapp/WEB-INF/jboss-web.xml
R hawkular-notifiers-sms/src/main/webapp/WEB-INF/web.xml
R hawkular-notifiers-sms/src/main/webapp/index.jsp
R hawkular-notifiers-snmp/pom.xml
R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/notifications/SnmpListener.java
R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/registration/RegisterListener.java
R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/registration/RegistrationInit.java
R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/jboss-web.xml
R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/web.xml
R hawkular-notifiers-snmp/src/main/webapp/index.jsp
M pom.xml
Log Message:
-----------
HWKALERTS-24 Refactoring of notifications
Commit: a0eb126fd948cf443afda30113dde76bf523dfd3
https://github.com/hawkular/hawkular-alerts/commit/a0eb126fd948cf443afda3...
Author: Lucas Ponce <ponce.ballesteros(a)gmail.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M README.adoc
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
Log Message:
-----------
Fix documentation for actions
Commit: c70d11f9723ba460cc68ab982b8e0b329354c9f4
https://github.com/hawkular/hawkular-alerts/commit/c70d11f9723ba460cc68ab...
Author: Lucas Ponce <ponce.ballesteros(a)gmail.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M hawkular-alerts-api/pom.xml
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.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/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/ConditionEval.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/data/Availability.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.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
A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy
Log Message:
-----------
Add Json anotations into API model
Commit: a5ef67b0de0dc95b2ed3631870324d9f69947fc0
https://github.com/hawkular/hawkular-alerts/commit/a5ef67b0de0dc95b2ed363...
Author: Lucas Ponce <ponce.ballesteros(a)gmail.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
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/test/java/org/hawkular/alerts/api/JsonTest.java
Log Message:
-----------
Fix json visibility only for definition
Commit: 2ac8f5b2ac297a13d2ec3ae97866d696a0d7789d
https://github.com/hawkular/hawkular-alerts/commit/2ac8f5b2ac297a13d2ec3a...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java
Log Message:
-----------
The 'metricType' field is no longer sent as part of H Metric's SingleMetric,
removing for compatibility.
Commit: 65365218a374c9a9327fad623287a95c114c310a
https://github.com/hawkular/hawkular-alerts/commit/65365218a374c9a9327fad...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M hawkular-actions-api/pom.xml
M hawkular-actions-email/pom.xml
M hawkular-actions-sms/pom.xml
M hawkular-actions-snmp/pom.xml
M hawkular-alerts-api/pom.xml
M hawkular-alerts-bus/pom.xml
M hawkular-alerts-ear/pom.xml
M hawkular-alerts-engine/pom.xml
M hawkular-alerts-rest/pom.xml
M pom.xml
Log Message:
-----------
change versions
Commit: 18f46cc1aaa87f33b7d483b910ed0563d7b017bf
https://github.com/hawkular/hawkular-alerts/commit/18f46cc1aaa87f33b7d483...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M pom.xml
Log Message:
-----------
move to latest parent pom
Commit: 60361f3c1a558f59f2b848c08f2401c58894b663
https://github.com/hawkular/hawkular-alerts/commit/60361f3c1a558f59f2b848...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
Log Message:
-----------
A few possible additions to Wintermute
- provide a default UUID triggerId if a triggerId is not provided. In most
prod cases it seems a generated ID will be desirable. users/apps will likely
not be able to provide a unique ID on their own.
- pull getDataId() down into the Condition base class as it is common to
almost all conditions and makes coding easier.
- Add a copyTrigger to the definitions service. This is experimental, the
idea being to enable using a Tokenized Trigger and generating a bunch
of explicit triggers by provising a map of token dataIds to real dataids.
Commit: 38e6ae6e6784bd1ea19e82b3475f788bf3b4d05a
https://github.com/hawkular/hawkular-alerts/commit/38e6ae6e6784bd1ea19e82...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2015-03-13 (Fri, 13 Mar 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/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/ConditionEval.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.java
A 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-api/src/test/java/org/hawkular/alerts/api/JsonTest.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
A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/GsonAdapter.java
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.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/DbDefinitionsServiceImplTest.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
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AlertsTest.groovy
Log Message:
-----------
- Add support for Alert persistence
- Add support for criteria-based Alert query
- Remove memory-based Alert caching
- change Alert.time to Alert.ctime for clarity and possibility of more associated times
- let CompareCondition properly use the inherited Condition.dataId
- Add preliminary tag support
TODO: Rest service support
Commit: 92d823a15c4f2f768f7d795709390a4d8bcd9b53
https://github.com/hawkular/hawkular-alerts/commit/92d823a15c4f2f768f7d79...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.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/BasicAlertsServiceImpl.java
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AlertsTest.groovy
Log Message:
-----------
Add rest service for fetching alerts by criteria
Commit: 5ee0a13331f45d249bfbafda2fdb6b5a181828fa
https://github.com/hawkular/hawkular-alerts/commit/5ee0a13331f45d249bfbaf...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2015-03-16 (Mon, 16 Mar 2015)
Changed paths:
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.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/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/TriggersTest.groovy
Log Message:
-----------
- Add Tag support to DefinitionsService
- Add Tag support to Rest services (TriggersHandler)
We have some formatter inconsistency between eclipse and intellij. param
annotations and field-aligned indentation are problems. Some format changes
to accommodate Eclipse, maybe IJ will be OK with it.
Commit: 590012aa13d2db04dc85c59c04acb56b805e60c2
https://github.com/hawkular/hawkular-alerts/commit/590012aa13d2db04dc85c5...
Author: Lucas Ponce <ponce.ballesteros(a)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/d6bfbedf3d6dd07d2f75e6...
Author: Lucas Ponce <ponce.ballesteros(a)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/a87741dd8505a4014782cb...
Author: Lucas Ponce <ponce.ballesteros(a)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/3648172484ee7927abb082...
Author: Lucas Ponce <ponce.ballesteros(a)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/2a44ad3cece0e0030b4b6d...
Author: Lucas Ponce <ponce.ballesteros(a)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/2d68ee013281c36d8a9d47...
Author: Lucas Ponce <ponce.ballesteros(a)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/ac89f1490cc28093cee548...
Author: Lucas Ponce <ponce.ballesteros(a)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/174dfc816cab089890bc34...
Author: Lucas Ponce <ponce.ballesteros(a)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/4d205b75d9460f563e8ef1...
Author: Jay Shaughnessy <jshaughn(a)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/a2476cf1195b819dec06a1...
Author: Jay Shaughnessy <jshaughn(a)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
Commit: 1cbf00a833bf6288e0d487bcd65ab553d830e51f
https://github.com/hawkular/hawkular-alerts/commit/1cbf00a833bf6288e0d487...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2015-03-17 (Tue, 17 Mar 2015)
Changed paths:
R hawkular-actions-sms/src/main/webapp/index.jsp
Log Message:
-----------
Merge branch 'winter/uuid' into wintermute
Conflicts:
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-snmp/src/main/webapp/index.jsp
hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
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/condition/ThresholdConditionEval.java
hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.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/TriggersTest.groovy
hawkular-notifiers-sms/src/main/webapp/index.jsp
hawkular-notifiers-snmp/src/main/webapp/index.jsp
Commit: 5106bf2324af7c005943fc2174922113f5f3e23a
https://github.com/hawkular/hawkular-alerts/commit/5106bf2324af7c005943fc...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2015-03-17 (Tue, 17 Mar 2015)
Changed paths:
A hawkular-actions-sms/src/main/webapp/index.jsp
R hawkular-actions-sms/src/main/webapp/index.jsp~5ee0a13331f45d249bfbafda2fdb6b5a181828fa
R hawkular-actions-sms/src/main/webapp/index.jsp~HEAD
Log Message:
-----------
fix merge issue
Commit: 8b2afbfe5eadb1408684b60c8ecaac28721adce3
https://github.com/hawkular/hawkular-alerts/commit/8b2afbfe5eadb1408684b6...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2015-03-17 (Tue, 17 Mar 2015)
Changed paths:
M hawkular-actions-api/pom.xml
M hawkular-actions-email/pom.xml
M hawkular-actions-sms/pom.xml
M hawkular-actions-snmp/pom.xml
M hawkular-alerts-api/pom.xml
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/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/ConditionEval.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
A 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-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-bus/pom.xml
M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java
M hawkular-alerts-ear/pom.xml
M hawkular-alerts-engine/pom.xml
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
A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/GsonAdapter.java
M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.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/DbDefinitionsServiceImplTest.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions.data
M hawkular-alerts-rest/pom.xml
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/TriggersHandler.java
M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AlertsTest.groovy
M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/TriggersTest.groovy
M pom.xml
Log Message:
-----------
Merge branch 'winter/uuid' into wintermute
Conflicts:
hawkular-actions-email/src/main/webapp/index.jsp
hawkular-actions-email/src/main/webapp/index.jsp~HEAD
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/Alert.java
hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
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/condition/ThresholdConditionEval.java
hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.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/TriggersTest.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/5a68e14da7a1...8b2afb...
10 years, 6 months
[hawkular/hawkular-alerts] 590012: HWKALERTS-24 Refactoring of notifications
by Jay Shaughnessy
Branch: refs/heads/winter/uuid
Home: https://github.com/hawkular/hawkular-alerts
Commit: 590012aa13d2db04dc85c59c04acb56b805e60c2
https://github.com/hawkular/hawkular-alerts/commit/590012aa13d2db04dc85c5...
Author: Lucas Ponce <ponce.ballesteros(a)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/d6bfbedf3d6dd07d2f75e6...
Author: Lucas Ponce <ponce.ballesteros(a)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/a87741dd8505a4014782cb...
Author: Lucas Ponce <ponce.ballesteros(a)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/3648172484ee7927abb082...
Author: Lucas Ponce <ponce.ballesteros(a)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/2a44ad3cece0e0030b4b6d...
Author: Lucas Ponce <ponce.ballesteros(a)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/2d68ee013281c36d8a9d47...
Author: Lucas Ponce <ponce.ballesteros(a)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/ac89f1490cc28093cee548...
Author: Lucas Ponce <ponce.ballesteros(a)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/174dfc816cab089890bc34...
Author: Lucas Ponce <ponce.ballesteros(a)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/4d205b75d9460f563e8ef1...
Author: Jay Shaughnessy <jshaughn(a)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/a2476cf1195b819dec06a1...
Author: Jay Shaughnessy <jshaughn(a)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...a2476c...
10 years, 6 months
