You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/02/06 12:36:21 UTC
[2/2] brooklyn-server git commit: This closes #534
This closes #534
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5c5d578f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5c5d578f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5c5d578f
Branch: refs/heads/master
Commit: 5c5d578f4e3c53e065cc84104fe7a4456ff5d764
Parents: 55ec074 d9e4c6f
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Mon Feb 6 12:35:41 2017 +0000
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Mon Feb 6 12:35:41 2017 +0000
----------------------------------------------------------------------
.../entity/machine/AddMachineMetrics.java | 2 +-
.../software/base/SoftwareProcessImpl.java | 42 +++---
.../machine/MachineEntityJcloudsRebindTest.java | 142 +++++++++++++++++++
.../entity/machine/MachineEntityRebindTest.java | 20 ++-
4 files changed, 179 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5c5d578f/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
----------------------------------------------------------------------
diff --cc software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
index 5fafa44,a89e479..8c6d5d0
--- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
@@@ -86,9 -85,10 +86,10 @@@ public class AddMachineMetrics implemen
}
- public static SshFeed createMachineMetricsFeed(EntityLocal entity) {
+ public static SshFeed createMachineMetricsFeed(Entity entity) {
boolean retrieveUsageMetrics = entity.config().get(SoftwareProcess.RETRIEVE_USAGE_METRICS);
return SshFeed.builder()
+ .uniqueTag("machineMetricsFeed")
.period(Duration.THIRTY_SECONDS)
.entity(entity)
.poll(SshPollConfig.forSensor(MachineAttributes.UPTIME)