[Hawkular-commits] [hawkular/hawkular-alerts] f65b96: HWKALERTS-101 Fix multi-tenancy issues *WIP*
Lucas Ponce
ponce.ballesteros at gmail.com
Fri Jan 8 11:28:43 EST 2016
Branch: refs/heads/master
Home: https://github.com/hawkular/hawkular-alerts
Commit: f65b96d1f7f90aab07986817621ba62a1d95d07c
https://github.com/hawkular/hawkular-alerts/commit/f65b96d1f7f90aab07986817621ba62a1d95d07c
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2016-01-06 (Wed, 06 Jan 2016)
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/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/EventCondition.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/RateCondition.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/data/Data.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/EventConditionTest.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
M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java
M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.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/PerfRulesEngineTest.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.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/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
Log Message:
-----------
HWKALERTS-101 Fix multi-tenancy issues *WIP*
- Add tenantId to Data
- Ensure tenantId on Conditions
- Ensure rulebase enforces tenant constraint between trigger/condition/data
Commit: 7443b5f4f5c3d534e77eb45f34c1ec67aabac1eb
https://github.com/hawkular/hawkular-alerts/commit/7443b5f4f5c3d534e77eb45f34c1ec67aabac1eb
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date: 2016-01-06 (Wed, 06 Jan 2016)
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/CommonData.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/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/ConditionEval.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventConditionEval.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/ExternalConditionEval.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/RateCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/RateConditionEval.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/Data.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/CassDefinitionsServiceImpl.java
M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.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/CassPersistenceTest.java
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.java
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/ConditionsITest.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/EventsLifecycleITest.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/PerfCrudITest.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-101 Fix multi-tenancy issues
All tests/itests are passing. A little more soak testing but this should be
close to a PR...
MultiTenancy issues extended into condition and dampening handling because
of they referenced only triggerId, as opposed to the unique combination
of tenantId+triggerId. The rulebase has been updated to use tenantId.
Unfortunately, proper handling required updating of Condition and
Dampening constructors to include a tenantId parameter, which had a
"ripple effect", touchig a lot of files.
REST clients do not need to provide a tenantId because one is automatically
assigned. There are a few constructors in place for use by REST client code,
sothers can be used by supplying an "" tenantId.
We may want to discuss whether we need more robust support for the rest
clients.
others are available
constructors is currently
Commit: 0bec7b3c32c11a404fda039f7368bf2fa5177b7c
https://github.com/hawkular/hawkular-alerts/commit/0bec7b3c32c11a404fda039f7368bf2fa5177b7c
Author: jshaughn <jshaughn at redhat.com>
Date: 2016-01-07 (Thu, 07 Jan 2016)
Changed paths:
M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java
M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java
Log Message:
-----------
Fix tenant-handling in MetricDataListener
Commit: e5bc54b931aa1a496b5a4dfaff87dcf34b833d0f
https://github.com/hawkular/hawkular-alerts/commit/e5bc54b931aa1a496b5a4dfaff87dcf34b833d0f
Author: Peter Palaga <ppalaga at redhat.com>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M pom.xml
Log Message:
-----------
Upgrade to Inventory 0.12.0.Final, Accounts 2.0.10.Final, Command
Gateway 0.10.7.Final and Commons 0.3.2.Final
Commit: 9a36c6ac80c5a9c45c4cf88917e0e8a37a75d700
https://github.com/hawkular/hawkular-alerts/commit/9a36c6ac80c5a9c45c4cf88917e0e8a37a75d700
Author: jshaughn <jshaughn at redhat.com>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java
M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java
Log Message:
-----------
touched files need the license updated to include -2016
Commit: 50ab474a2a4162aca331ffcf81a2b0ca484dc562
https://github.com/hawkular/hawkular-alerts/commit/50ab474a2a4162aca331ffcf81a2b0ca484dc562
Author: Lucas Ponce <ponce.ballesteros at gmail.com>
Date: 2016-01-08 (Fri, 08 Jan 2016)
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/CommonData.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/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/EventCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventConditionEval.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/ExternalConditionEval.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/RateCondition.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/RateConditionEval.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/Data.java
M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/EventConditionTest.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
M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.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/org/hawkular/alerts/engine/rules/ConditionMatch.drl
M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.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/PersistenceTest.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/ConditionsITest.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/EventsLifecycleITest.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/PerfCrudITest.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:
-----------
Merge pull request #139 from jshaughn/hwkalerts-101
The PR looks good.
Compare: https://github.com/hawkular/hawkular-alerts/compare/2b05b4acbae7...50ab474a2a41
More information about the hawkular-commits
mailing list