[Hawkular-commits] [hawkular/hawkular-alerts] 7166de: HWKALERTS-89 Normalize Incoming Data Format

Branch: refs/heads/Events Home: https://github.com/hawkular/hawkular-alerts Commit: 7166de1eefcc584ff7aae1004659e7429f97283d https://github.com/hawkular/hawkular-alerts/commit/7166de1eefcc584ff7aae1... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-09-18 (Fri, 18 Sep 2015) Changed paths: M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java A hawkular-alerts-actions-plugins/.gitignore 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/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/CompareConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalConditionEval.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/ThresholdConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeConditionEval.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/MixedData.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/AvailDataListener.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertData.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertDataMessage.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 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-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.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/ActionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java Log Message: ----------- HWKALERTS-89 Normalize Incoming Data Format - remove Availability, NumericData StringData and MixedData - redefine Data to be used as the sole data format - let the ConditionEval impls deal with any conversion - provide convenience factory methods for when caller knows the data type he wants to provide. - Note, support for multi-value conditions (i.e. the 'values' field) is anticipated but not yet a reality. - Make AvailabilityType a 1st class citizen - Note: REST API CHANGE in sendData endpoint, but this is not [yet] used in Hawkular code outside of alerts. - Update bus integration code (topic listeners) to use new mechanism Commit: c47dc0aeae9cf12e4db63657b7f503f603c9effc https://github.com/hawkular/hawkular-alerts/commit/c47dc0aeae9cf12e4db636... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-09-22 (Tue, 22 Sep 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java Log Message: ----------- Comment out the multi-value case until it's needed, and per review feedback, when it's needed consider rolling the single-value case into the multi-value case. Commit: 5c74af308abd47a1223a5b1b19c27295b580670d https://github.com/hawkular/hawkular-alerts/commit/5c74af308abd47a1223a5b... 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 A hawkular-alerts-actions-plugins/.gitignore 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/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/CompareConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalConditionEval.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/ThresholdConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeConditionEval.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/MixedData.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/AvailDataListener.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertData.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertDataMessage.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 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-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.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/ActionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java Log Message: ----------- Merge pull request #93 from jshaughn/hwkalerts-89 Hwkalerts 89 Compare: https://github.com/hawkular/hawkular-alerts/compare/5805afac9e6c...5c74af...