Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9edc9231 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9edc9231 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9edc9231 Branch: refs/heads/master Commit: 9edc9231f179d7f926f807b2da6fd3ba011d7570 Parents: 89225d2 5314c31 Author: Manula Thantriwatte <[email protected]> Authored: Fri Dec 20 15:40:18 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Fri Dec 20 15:40:18 2013 +0530 ---------------------------------------------------------------------- .../publisher/CartridgeAgentEventPublisher.java | 78 +++++++++++++------- .../publisher/HealthStatisticsNotifier.java | 4 +- .../publisher/HealthStatisticsPublisher.java | 5 +- .../publisher/WSO2CEPStatisticsPublisher.java | 2 +- .../conf/configurator/CEPConfigurator.java | 2 +- .../health/stat/AverageLoadAverageEvent.java | 6 +- .../stat/AverageMemoryConsumptionEvent.java | 6 +- .../stat/AverageRequestsInFlightEvent.java | 6 +- .../health/stat/GradientOfLoadAverageEvent.java | 6 +- .../stat/GradientOfMemoryConsumptionEvent.java | 6 +- .../stat/GradientOfRequestsInFlightEvent.java | 6 +- .../event/health/stat/HealthStatEvent.java | 32 ++++++++ .../stat/MemberAverageLoadAverageEvent.java | 6 +- .../MemberAverageMemoryConsumptionEvent.java | 6 +- .../event/health/stat/MemberFaultEvent.java | 6 +- .../stat/MemberGradientOfLoadAverageEvent.java | 6 +- .../MemberGradientOfMemoryConsumptionEvent.java | 6 +- ...emberSecondDerivativeOfLoadAverageEvent.java | 6 +- ...econdDerivativeOfMemoryConsumptionEvent.java | 6 +- .../SecondDerivativeOfLoadAverageEvent.java | 5 +- ...econdDerivativeOfMemoryConsumptionEvent.java | 6 +- ...SecondDerivativeOfRequestsInFlightEvent.java | 6 +- .../AverageLoadAverageMessageProcessor.java | 66 +++++++++++++++++ ...verageMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++ ...AverageRequestsInFlightMessageProcessor.java | 66 +++++++++++++++++ .../GradientOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++ ...ientOfMemoryConsumptionMessageProcessor.java | 65 ++++++++++++++++ ...dientOfRequestsInFlightMessageProcessor.java | 66 +++++++++++++++++ ...emberAverageLoadAverageMessageProcessor.java | 66 +++++++++++++++++ ...verageMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++ .../stat/MemberFaultMessageProcessor.java | 66 +++++++++++++++++ ...erGradientOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++ ...ientOfMemoryConsumptionMessageProcessor.java | 67 +++++++++++++++++ ...DerivativeOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++ ...tiveOfMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++ ...DerivativeOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++ ...tiveOfMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++ ...ativeOfRequestsInFlightMessageProcessor.java | 66 +++++++++++++++++ .../src/main/bin/haproxy-extension.sh | 2 +- .../src/main/bin/cartridge-agent.sh | 3 +- .../modules/scripts/ec2/cartridge-agent.sh | 19 +++-- 41 files changed, 1190 insertions(+), 108 deletions(-) ----------------------------------------------------------------------
