[Hawkular-commits] [hawkular/hawkular-alerts] c9b109: WIP

Branch: refs/heads/Events Home: https://github.com/hawkular/hawkular-alerts Commit: c9b109fa243d28937affb3af14b6e62c4fb8f708 https://github.com/hawkular/hawkular-alerts/commit/c9b109fa243d28937affb3... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-09-22 (Tue, 22 Sep 2015) Changed paths: A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/AbstractEvent.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java Log Message: ----------- WIP Commit: f12c9310c85e68ade2039d1b6c68acb1c97a4e1e https://github.com/hawkular/hawkular-alerts/commit/f12c9310c85e68ade2039d... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-09-22 (Tue, 22 Sep 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-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.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/Alert.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/AbstractEvent.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Thin.java M 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-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java Log Message: ----------- WIP - Possible Refactor For Alerts with Events Amend #1 : review with Lucas - merge AbstractEvent into [concrete] Event - have Alert extend Event - move severity back up to Alert - add eventText to Event For now, we won't have type/category as a separate field, nor will we have a field for source/owner. Instead see how far we get with context (not searchable) and tags (searchable) Commit: edb518d9edb4ed36189deafdbfa92c23859b2c2e https://github.com/hawkular/hawkular-alerts/commit/edb518d9edb4ed36189dea... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-09-22 (Tue, 22 Sep 2015) Changed paths: M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java Log Message: ----------- Rebase on Origin Events and fix merge issues Commit: 08cbb56e709cc6cfd7d0c671ef1c4418bf274971 https://github.com/hawkular/hawkular-alerts/commit/08cbb56e709cc6cfd7d0c6... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-09-23 (Wed, 23 Sep 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-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.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/Alert.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Thin.java M 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-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java Log Message: ----------- Merge pull request #95 from jshaughn/jay-events Initial introduction of Event into the model Compare: https://github.com/hawkular/hawkular-alerts/compare/3668b16cfb54...08cbb5...