Closing #204 * github/pr/204: Changes based on review comments for machine metrics Stop feeds when stopping software process Moved sensor feed for machine metrics to an EntityInitializer Add static helper method to PollConfig objects
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/af4576d0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/af4576d0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/af4576d0 Branch: refs/heads/master Commit: af4576d0936b135c58aeefa32dc6217621d280ae Parents: 99d073f 2d99fd4 Author: Andrew Donald Kennedy <[email protected]> Authored: Wed Jun 22 13:52:21 2016 -0700 Committer: Andrew Donald Kennedy <[email protected]> Committed: Wed Jun 22 13:52:21 2016 -0700 ---------------------------------------------------------------------- .../brooklyn/core/entity/AbstractEntity.java | 83 ++++++---- .../brooklyn/core/entity/EntityInternal.java | 25 ++- .../feed/function/FunctionPollConfig.java | 8 +- .../brooklyn/feed/shell/ShellPollConfig.java | 14 +- .../apache/brooklyn/feed/ssh/SshPollConfig.java | 18 ++- .../WindowsPerformanceCounterPollConfig.java | 14 +- .../brooklyn/util/core/task/DynamicTasks.java | 4 +- .../apache/brooklyn/util/core/task/Tasks.java | 10 +- .../policy/autoscaling/AutoScalerPolicy.java | 4 +- .../entity/chef/ChefAttributePollConfig.java | 14 +- .../entity/machine/AddMachineMetrics.java | 155 +++++++++++++++++++ .../entity/machine/MachineAttributes.java | 1 + .../brooklyn/entity/machine/MachineEntity.java | 8 - .../entity/machine/MachineEntityImpl.java | 108 +++---------- .../software/base/SoftwareProcessImpl.java | 65 ++++---- .../MachineLifecycleEffectorTasks.java | 45 ++++-- .../feed/jmx/JmxAttributePollConfig.java | 14 +- .../feed/jmx/JmxOperationPollConfig.java | 8 + .../machine/MachineEntityEc2LiveTest.java | 12 +- .../base/SoftwareProcessEntityTest.java | 39 +++-- 20 files changed, 415 insertions(+), 234 deletions(-) ----------------------------------------------------------------------
