Repository: stratos Updated Branches: refs/heads/master b96d97df6 -> 31b66a5c9
initial changes for CEP artifact to support instances in Applications/Groups/Clusters Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/31b66a5c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/31b66a5c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/31b66a5c Branch: refs/heads/master Commit: 31b66a5c9e3d2d96d3dc9f123b8e005be1ac0337 Parents: b96d97d Author: Isuru Haththotuwa <[email protected]> Authored: Sun Nov 23 21:51:24 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Wed Nov 26 12:57:37 2014 +0530 ---------------------------------------------------------------------- .../health/stat/AverageLoadAverageEvent.java | 8 +++++++- .../stat/AverageMemoryConsumptionEvent.java | 8 +++++++- .../stat/AverageRequestsInFlightEvent.java | 7 ++++++- .../health/stat/GradientOfLoadAverageEvent.java | 8 +++++++- .../stat/GradientOfMemoryConsumptionEvent.java | 8 +++++++- .../stat/GradientOfRequestsInFlightEvent.java | 8 +++++++- .../stat/MemberAverageLoadAverageEvent.java | 7 ++++++- .../MemberAverageMemoryConsumptionEvent.java | 7 ++++++- .../event/health/stat/MemberFaultEvent.java | 2 +- .../stat/MemberGradientOfLoadAverageEvent.java | 9 +++++++-- ...MemberSecondDerivativeOfLoadAverageEvent.java | 9 +++++++-- ...SecondDerivativeOfMemoryConsumptionEvent.java | 9 +++++++-- .../stat/SecondDerivativeOfLoadAverageEvent.java | 8 +++++++- ...SecondDerivativeOfMemoryConsumptionEvent.java | 8 +++++++- .../SecondDerivativeOfRequestsInFlightEvent.java | 8 +++++++- .../AverageInFlightRequestsEventFormatter.xml | 2 +- .../AverageLoadAverageEventFormatter.xml | 2 +- .../AverageMemoryConsumptionEventFormatter.xml | 2 +- .../AverageServedRequestsEventFormatter.xml | 2 +- .../FaultMessageEventFormatter.xml | 2 +- .../GradientInFlightRequestsEventFormatter.xml | 2 +- .../GradientLoadAverageEventFormatter.xml | 2 +- .../GradientMemoryConsumptionEventFormatter.xml | 2 +- .../MemberAverageLoadAverageEventFormatter.xml | 2 +- ...berAverageMemoryConsumptionEventFormatter.xml | 2 +- .../MemberGradientLoadAverageEventFormatter.xml | 2 +- ...erGradientMemoryConsumptionEventFormatter.xml | 2 +- ...SecondDerivativeLoadAverageEventFormatter.xml | 2 +- ...DerivativeMemoryConsumptionEventFormatter.xml | 2 +- ...dDerivativeInFlightRequestsEventFormatter.xml | 2 +- ...SecondDerivativeLoadAverageEventFormatter.xml | 2 +- ...DerivativeMemoryConsumptionEventFormatter.xml | 2 +- .../executionplans/AverageHeathRequest.xml | 12 ++++++------ .../AverageInFlightRequestsFinder.xml | 6 +++--- .../executionplans/GradientOfHealthRequest.xml | 12 ++++++------ .../GradientOfRequestsInFlightFinder.xml | 4 ++-- .../SecondDerivativeOfHealthRequest.xml | 10 +++++----- .../SecondDerivativeOfRequestsInFlightFinder.xml | 4 ++-- .../streamdefinitions/stream-manager-config.xml | 19 +++++++++++++++++++ .../extension/FaultHandlingWindowProcessor.java | 6 +++--- 40 files changed, 159 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageLoadAverageEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageLoadAverageEvent.java index db03435..c968151 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageLoadAverageEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageLoadAverageEvent.java @@ -28,12 +28,14 @@ public class AverageLoadAverageEvent extends Event { private final String networkPartitionId; private final String clusterId; private final float value; + private final String instanceId; - public AverageLoadAverageEvent(String networkPartitionId, String clusterId, float value){ + public AverageLoadAverageEvent(String networkPartitionId, String clusterId, String instanceId, float value){ this.networkPartitionId = networkPartitionId; this.clusterId = clusterId; this.value = value; + this.instanceId = instanceId; } @@ -48,4 +50,8 @@ public class AverageLoadAverageEvent extends Event { public String getNetworkPartitionId() { return networkPartitionId; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageMemoryConsumptionEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageMemoryConsumptionEvent.java index 2f13b09..d585545 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageMemoryConsumptionEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageMemoryConsumptionEvent.java @@ -27,12 +27,14 @@ import org.apache.stratos.messaging.event.Event; public class AverageMemoryConsumptionEvent extends Event { private final String networkPartitionId; private final String clusterId; + private final String instanceId; private final float value; - public AverageMemoryConsumptionEvent(String networkPartitionId, String clusterId, float value){ + public AverageMemoryConsumptionEvent(String networkPartitionId, String clusterId, String instanceId, float value){ this.networkPartitionId = networkPartitionId; this.clusterId = clusterId; + this.instanceId = instanceId; this.value = value; } @@ -48,4 +50,8 @@ public class AverageMemoryConsumptionEvent extends Event { public String getNetworkPartitionId() { return networkPartitionId; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsInFlightEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsInFlightEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsInFlightEvent.java index 0e10af9..3f58ebc 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsInFlightEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsInFlightEvent.java @@ -27,13 +27,15 @@ import org.apache.stratos.messaging.event.Event; public class AverageRequestsInFlightEvent extends Event { private final String networkPartitionId; private final String clusterId; + private final String instanceId; private final float value; private final float servedCount; private final float activeInstances; - public AverageRequestsInFlightEvent(String networkPartitionId, String clusterId,float activeInstances, float value, float servedCount ) { + public AverageRequestsInFlightEvent(String networkPartitionId, String clusterId, String instanceId, float activeInstances, float value, float servedCount ) { this.networkPartitionId = networkPartitionId; this.clusterId = clusterId; + this.instanceId = instanceId; this.value = value; this.servedCount = servedCount; this.activeInstances = activeInstances; @@ -56,4 +58,7 @@ public class AverageRequestsInFlightEvent extends Event { public float getActiveInstances() { return activeInstances;} + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfLoadAverageEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfLoadAverageEvent.java index e12b35b..815c0f7 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfLoadAverageEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfLoadAverageEvent.java @@ -27,11 +27,13 @@ import org.apache.stratos.messaging.event.Event; public class GradientOfLoadAverageEvent extends Event { private final String networkPartitionId; private final String clusterId; + private final String instanceId; private final float value; - public GradientOfLoadAverageEvent(String networkPartitionId, String clusterId, float value) { + public GradientOfLoadAverageEvent(String networkPartitionId, String clusterId, String instanceId, float value) { this.networkPartitionId = networkPartitionId; this.clusterId = clusterId; + this.instanceId = instanceId; this.value = value; } @@ -47,4 +49,8 @@ public class GradientOfLoadAverageEvent extends Event { public String getNetworkPartitionId() { return networkPartitionId; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfMemoryConsumptionEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfMemoryConsumptionEvent.java index 56e43b6..1779652 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfMemoryConsumptionEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfMemoryConsumptionEvent.java @@ -27,11 +27,13 @@ import org.apache.stratos.messaging.event.Event; public class GradientOfMemoryConsumptionEvent extends Event { private final String networkPartitionId; private final String clusterId; + private final String instanceId; private final float value; - public GradientOfMemoryConsumptionEvent(String networkPartitionId, String clusterId, float value) { + public GradientOfMemoryConsumptionEvent(String networkPartitionId, String clusterId, String instanceId, float value) { this.networkPartitionId = networkPartitionId; this.clusterId = clusterId; + this.instanceId = instanceId; this.value = value; } @@ -47,4 +49,8 @@ public class GradientOfMemoryConsumptionEvent extends Event { public String getNetworkPartitionId() { return networkPartitionId; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfRequestsInFlightEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfRequestsInFlightEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfRequestsInFlightEvent.java index b92a985..cd4fe5b 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfRequestsInFlightEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfRequestsInFlightEvent.java @@ -27,11 +27,13 @@ import org.apache.stratos.messaging.event.Event; public class GradientOfRequestsInFlightEvent extends Event { private final String networkPartitionId; private final String clusterId; + private final String instanceId; private final float value; - public GradientOfRequestsInFlightEvent(String networkPartitionId, String clusterId, float value) { + public GradientOfRequestsInFlightEvent(String networkPartitionId, String clusterId, String instanceId, float value) { this.networkPartitionId = networkPartitionId; this.clusterId = clusterId; + this.instanceId = instanceId; this.value = value; } @@ -47,4 +49,8 @@ public class GradientOfRequestsInFlightEvent extends Event { public String getNetworkPartitionId() { return networkPartitionId; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageLoadAverageEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageLoadAverageEvent.java index 5ad0211..33f455e 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageLoadAverageEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageLoadAverageEvent.java @@ -26,9 +26,11 @@ import org.apache.stratos.messaging.event.Event; */ public class MemberAverageLoadAverageEvent extends Event { private final String memberId; + private final String instanceId; private final float value; - public MemberAverageLoadAverageEvent(String memberId, float value) { + public MemberAverageLoadAverageEvent(String instanceId, String memberId, float value) { + this.instanceId = instanceId; this.memberId = memberId; this.value = value; } @@ -42,4 +44,7 @@ public class MemberAverageLoadAverageEvent extends Event { return value; } + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageMemoryConsumptionEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageMemoryConsumptionEvent.java index 85025c5..87fc446 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageMemoryConsumptionEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageMemoryConsumptionEvent.java @@ -25,10 +25,12 @@ import org.apache.stratos.messaging.event.Event; * This event is fired by Event processing engine to send average of memory consumption */ public class MemberAverageMemoryConsumptionEvent extends Event { + private final String instanceId; private final String memberId; private final float value; - public MemberAverageMemoryConsumptionEvent(String memberId, float value) { + public MemberAverageMemoryConsumptionEvent(String instanceId, String memberId, float value) { + this.instanceId = instanceId; this.memberId = memberId; this.value = value; } @@ -42,4 +44,7 @@ public class MemberAverageMemoryConsumptionEvent extends Event { return value; } + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java index bec4df8..da358ff 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java @@ -35,9 +35,9 @@ public class MemberFaultEvent extends Event { public MemberFaultEvent(String clusterId, String memberId, String partitionId, String instanceId, float value) { this.clusterId = clusterId; + this.instanceId = instanceId; this.memberId = memberId; this.partitionId = partitionId; - this.instanceId = instanceId; this.value = value; } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfLoadAverageEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfLoadAverageEvent.java index d0f8ae5..a9f8829 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfLoadAverageEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfLoadAverageEvent.java @@ -25,11 +25,12 @@ import org.apache.stratos.messaging.event.Event; * This event is fired by Event processing engine to send gradient of Load average */ public class MemberGradientOfLoadAverageEvent extends Event { - + private final String instanceId; private final String memberId; private final float value; - public MemberGradientOfLoadAverageEvent(String memberId, float value) { + public MemberGradientOfLoadAverageEvent(String instanceId, String memberId, float value) { + this.instanceId = instanceId; this.memberId = memberId; this.value = value; } @@ -42,4 +43,8 @@ public class MemberGradientOfLoadAverageEvent extends Event { public float getValue() { return value; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfLoadAverageEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfLoadAverageEvent.java index 650043f..23be4f0 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfLoadAverageEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfLoadAverageEvent.java @@ -25,11 +25,12 @@ import org.apache.stratos.messaging.event.Event; * This event is fired by Event processing engine to send second derivative of Load average */ public class MemberSecondDerivativeOfLoadAverageEvent extends Event { - + private final String clusterId; private final String memberId; private final float value; - public MemberSecondDerivativeOfLoadAverageEvent(String memberId, float value) { + public MemberSecondDerivativeOfLoadAverageEvent(String clusterId, String memberId, float value) { + this.clusterId = clusterId; this.memberId = memberId; this.value = value; } @@ -42,4 +43,8 @@ public class MemberSecondDerivativeOfLoadAverageEvent extends Event { public float getValue() { return value; } + + public String getClusterId() { + return clusterId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfMemoryConsumptionEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfMemoryConsumptionEvent.java index 532c6dd..6d96b0b 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfMemoryConsumptionEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfMemoryConsumptionEvent.java @@ -25,11 +25,12 @@ import org.apache.stratos.messaging.event.Event; * This event is fired by Event processing engine to send second derivative of memory consumption */ public class MemberSecondDerivativeOfMemoryConsumptionEvent extends Event { - + private final String instanceId; private final String memberId; private final float value; - public MemberSecondDerivativeOfMemoryConsumptionEvent(String memberId, float value) { + public MemberSecondDerivativeOfMemoryConsumptionEvent(String instanceId, String memberId, float value) { + this.instanceId = instanceId; this.memberId = memberId; this.value = value; } @@ -42,4 +43,8 @@ public class MemberSecondDerivativeOfMemoryConsumptionEvent extends Event { public float getValue() { return value; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfLoadAverageEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfLoadAverageEvent.java index efc54ed..9c565f4 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfLoadAverageEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfLoadAverageEvent.java @@ -28,11 +28,13 @@ public class SecondDerivativeOfLoadAverageEvent extends Event { private final String networkPartitionId; private final String clusterId; + private final String instanceId; private final float value; - public SecondDerivativeOfLoadAverageEvent(String networkPartitionId, String clusterId, float value) { + public SecondDerivativeOfLoadAverageEvent(String networkPartitionId, String clusterId, String instanceId, float value) { this.networkPartitionId = networkPartitionId; this.clusterId = clusterId; + this.instanceId = instanceId; this.value = value; } @@ -48,4 +50,8 @@ public class SecondDerivativeOfLoadAverageEvent extends Event { public String getNetworkPartitionId() { return networkPartitionId; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfMemoryConsumptionEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfMemoryConsumptionEvent.java index bd36b76..9964842 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfMemoryConsumptionEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfMemoryConsumptionEvent.java @@ -28,11 +28,13 @@ public class SecondDerivativeOfMemoryConsumptionEvent extends Event { private final String networkPartitionId; private final String clusterId; + private final String instanceId; private final float value; - public SecondDerivativeOfMemoryConsumptionEvent(String networkPartitionId, String clusterId, float value) { + public SecondDerivativeOfMemoryConsumptionEvent(String networkPartitionId, String clusterId, String instanceId, float value) { this.networkPartitionId = networkPartitionId; this.clusterId = clusterId; + this.instanceId = instanceId; this.value = value; } @@ -48,4 +50,8 @@ public class SecondDerivativeOfMemoryConsumptionEvent extends Event { public String getNetworkPartitionId() { return networkPartitionId; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfRequestsInFlightEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfRequestsInFlightEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfRequestsInFlightEvent.java index cd6fe6c..735b910 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfRequestsInFlightEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfRequestsInFlightEvent.java @@ -26,11 +26,13 @@ import org.apache.stratos.messaging.event.Event; */ public class SecondDerivativeOfRequestsInFlightEvent extends Event { private final String clusterId; + private final String instanceId; private final String networkPartitionId; private final float value; - public SecondDerivativeOfRequestsInFlightEvent(String clusterId, String networkPartitionId, float value) { + public SecondDerivativeOfRequestsInFlightEvent(String clusterId, String instanceId, String networkPartitionId, float value) { this.clusterId = clusterId; + this.instanceId = instanceId; this.networkPartitionId = networkPartitionId; this.value = value; } @@ -47,4 +49,8 @@ public class SecondDerivativeOfRequestsInFlightEvent extends Event { public String getNetworkPartitionId() { return networkPartitionId; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml b/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml index 84e95ae..4a5317b 100644 --- a/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="average_in_flight_requests" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.AverageRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","activeInstances":"{{instances_count}}","value":"{{count}}" ,"servedCount":"{{served_count}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.AverageRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","activeInstances":"{{instances_count}}","value":"{{count}}" ,"servedCount":"{{served_count}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml index d06f801..0d7da89 100644 --- a/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="average_load_average_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.AverageLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{average_load_average}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.AverageLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{average_load_average}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml index 20d8a87..2624a29 100644 --- a/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="average_memory_consumption_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.AverageMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{average_memory_consumption}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.AverageMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{average_memory_consumption}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/AverageServedRequestsEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/AverageServedRequestsEventFormatter.xml b/extensions/cep/artifacts/eventformatters/AverageServedRequestsEventFormatter.xml index 58e9d95..513d503 100755 --- a/extensions/cep/artifacts/eventformatters/AverageServedRequestsEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/AverageServedRequestsEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="average_served_request_count" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.AverageRequestsServingCapabilityEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{average_served_count}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.AverageRequestsServingCapabilityEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{average_served_count}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml index 8194aec..e5384a6 100644 --- a/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="fault_message" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.MemberFaultEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","memberId":"{{member_id}}","partitionId":"{{partition_id}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.MemberFaultEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","memberId":"{{member_id}}","partitionId":"{{partition_id}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml b/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml index 7ffe435..c225b33 100644 --- a/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml @@ -24,7 +24,7 @@ trace="disable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="gradient_in_flight_requests" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.GradientOfRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{count}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.GradientOfRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{count}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml index 04ac390..5cb14e8 100644 --- a/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="gradient_load_average_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.GradientOfLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{gradient_load_average}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.GradientOfLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{gradient_load_average}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml index b2a13fa..c749474 100644 --- a/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="gradient_memory_consumption_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.GradientOfMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{gradient_memory_consumption}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.GradientOfMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{gradient_memory_consumption}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml index a9c7a72..aa3c880 100644 --- a/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="member_average_load_average_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.MemberAverageLoadAverageEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_average_load_average}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.MemberAverageLoadAverageEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_average_load_average}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml index e9a9fbd..dd8cb3d 100644 --- a/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="member_average_memory_consumption_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.MemberAverageMemoryConsumptionEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_average_memory_consumption}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.MemberAverageMemoryConsumptionEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_average_memory_consumption}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml index 68deba4..6e039b6 100644 --- a/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="member_gradient_load_average_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.MemberGradientOfLoadAverageEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_gradient_load_average}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.MemberGradientOfLoadAverageEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_gradient_load_average}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml index ab9ec00..ad95496 100644 --- a/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="member_gradient_memory_consumption_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.MemberGradientOfMemoryConsumptionEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_gradient_memory_consumption}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.MemberGradientOfMemoryConsumptionEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_gradient_memory_consumption}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml index 7548e56..7e81ae4 100644 --- a/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="member_second_derivative_load_average_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.MemberSecondDerivativeOfLoadAverageEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_second_derivative_load_average}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.MemberSecondDerivativeOfLoadAverageEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_second_derivative_load_average}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml index 85932ec..d5b93a9 100644 --- a/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="member_second_derivative_memory_consumption_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.MemberSecondDerivativeOfMemoryConsumptionEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_second_derivative_memory_consumption}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.MemberSecondDerivativeOfMemoryConsumptionEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{member_second_derivative_memory_consumption}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml b/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml index 951b2a1..41be357 100644 --- a/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="second_derivative_in_flight_requests" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{count}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{count}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml index e1c1d12..5113345 100644 --- a/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="second_derivative_load_average_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{second_derivative_load_average}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{second_derivative_load_average}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml index 7d7e33a..0cd35bc 100644 --- a/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml +++ b/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml @@ -24,7 +24,7 @@ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter";> <from streamName="second_derivative_memory_consumption_stats" version="1.0.0"/> <mapping customMapping="enable" type="json"> - <inline>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{second_derivative_memory_consumption}}"}}}</inline> + <inline>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{second_derivative_memory_consumption}}"}}}</inline> </mapping> <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> <property name="transport.jms.Destination">summarized-health-stats</property> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml b/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml index 598f62a..23353f3 100644 --- a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml +++ b/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml @@ -32,27 +32,27 @@ </importedStreams> <queryExpressions><![CDATA[ from health_avg_processsor [health_description == 'ports_not_open'] - select cluster_id, network_partition_id, member_id, partition_id insert into fault_message; + select cluster_id, instance_id, network_partition_id, member_id, partition_id insert into fault_message; from health_avg_processsor - select cluster_id, network_partition_id, member_id, partition_id, health_description, value, + select cluster_id, instance_id, network_partition_id, member_id, partition_id, health_description, value, stratos:concat(cluster_id, '-' , network_partition_id) as health_grad_cluster_network insert into health_avg_concatinator; define partition health_avg_cluster_partition by health_avg_concatinator.health_grad_cluster_network; define partition member_health_avg_cluster_partition by health_avg_processsor.member_id; from health_avg_concatinator [health_description == 'load_average'] - #window.timeBatch(1 min) select cluster_id, network_partition_id, avg(value) as average_load_average + #window.timeBatch(1 min) select cluster_id, instance_id, network_partition_id, avg(value) as average_load_average insert into average_load_average_stats partition by health_avg_cluster_partition; from health_avg_processsor [health_description == 'load_average'] - #window.timeBatch(1 min) select member_id, cluster_id, network_partition_id, avg(value) as member_average_load_average + #window.timeBatch(1 min) select member_id, cluster_id, instance_id, network_partition_id, avg(value) as member_average_load_average insert into member_average_load_average_stats partition by member_health_avg_cluster_partition; from health_avg_processsor [health_description == 'memory_consumption'] - #window.timeBatch(1 min) select member_id, cluster_id, network_partition_id, avg(value) as member_average_memory_consumption + #window.timeBatch(1 min) select member_id, cluster_id, instance_id, network_partition_id, avg(value) as member_average_memory_consumption insert into member_average_memory_consumption_stats partition by member_health_avg_cluster_partition; from health_avg_concatinator [health_description == 'memory_consumption'] - #window.timeBatch(1 min) select cluster_id, network_partition_id, avg(value) as average_memory_consumption + #window.timeBatch(1 min) select cluster_id, instance_id, network_partition_id, avg(value) as average_memory_consumption insert into average_memory_consumption_stats partition by health_avg_cluster_partition; ]]></queryExpressions> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml b/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml index a8e890f..ea542be 100644 --- a/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml +++ b/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml @@ -32,16 +32,16 @@ </importedStreams> <queryExpressions><![CDATA[ from avg_rif_stat - select cluster_id, network_partition_id,active_instances_count, in_flight_request_count,served_request_count, + select cluster_id, instance_id, network_partition_id,active_instances_count, in_flight_request_count,served_request_count, stratos:concat(cluster_id, '-' , network_partition_id) as avg_rif_cluster_network insert into avg_rif_concat; define partition avg_rif_cluster_partition by avg_rif_concat.avg_rif_cluster_network; from avg_rif_concat#window.timeBatch(1 min) - select cluster_id,network_partition_id,avg(active_instances_count) as instances_count, avg(in_flight_request_count) as count , sum(served_request_count) as served_count + select cluster_id, instance_id, network_partition_id,avg(active_instances_count) as instances_count, avg(in_flight_request_count) as count , sum(served_request_count) as served_count insert into average_in_flight_requests partition by avg_rif_cluster_partition; from average_in_flight_requests - select cluster_id, network_partition_id,instances_count, served_count, + select cluster_id, instance_id, network_partition_id,instances_count, served_count, stratos:divider(served_count , instances_count) as requests_per_instance insert into served_requests_per_instance; from served_requests_per_instance[requests_per_instance>0]#window.timeBatch(10 min) http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml index 9ae0042..353c6d4 100644 --- a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml +++ b/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml @@ -32,28 +32,28 @@ </importedStreams> <queryExpressions><![CDATA[ from health_grad_processsor - #window.stratos:faultHandling(1min, member_id) select cluster_id, network_partition_id, member_id, partition_id + #window.stratos:faultHandling(1min, member_id) select cluster_id, instance_id, network_partition_id, member_id, partition_id group by cluster_id, network_partition_id insert into fault_message; from health_grad_processsor - select cluster_id, network_partition_id, member_id, partition_id, health_description, value, + select cluster_id, instance_id, network_partition_id, member_id, partition_id, health_description, value, stratos:concat(cluster_id, '-' , network_partition_id) as health_grad_cluster_network insert into health_grad_concatinator; define partition health_grad_cluster_partition by health_grad_concatinator.health_grad_cluster_network; define partition member_health_grad_cluster_partition by health_grad_processsor.member_id; from health_grad_concatinator [health_description == 'load_average'] - #window.stratos:gradient(1 min, value) select cluster_id, network_partition_id, value as gradient_load_average + #window.stratos:gradient(1 min, value) select cluster_id, instance_id, network_partition_id, value as gradient_load_average insert into gradient_load_average_stats partition by health_grad_cluster_partition; from health_grad_processsor [health_description == 'load_average'] - #window.stratos:gradient(1 min, value) select member_id, cluster_id, network_partition_id, value as member_gradient_load_average + #window.stratos:gradient(1 min, value) select member_id, cluster_id, instance_id, network_partition_id, value as member_gradient_load_average insert into member_gradient_load_average_stats partition by member_health_grad_cluster_partition; from health_grad_processsor [health_description == 'memory_consumption'] - #window.stratos:gradient(1 min, value) select member_id, cluster_id, network_partition_id, value as member_gradient_memory_consumption + #window.stratos:gradient(1 min, value) select member_id, cluster_id, instance_id, network_partition_id, value as member_gradient_memory_consumption insert into member_gradient_memory_consumption_stats partition by member_health_grad_cluster_partition; from health_grad_concatinator [health_description == 'memory_consumption'] - #window.stratos:gradient(1 min, value) select cluster_id, network_partition_id, value as gradient_memory_consumption + #window.stratos:gradient(1 min, value) select cluster_id, instance_id, network_partition_id, value as gradient_memory_consumption insert into gradient_memory_consumption_stats partition by health_grad_cluster_partition;]]></queryExpressions> <exportedStreams> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml index e63911e..c4ea5eb 100644 --- a/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml +++ b/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml @@ -32,13 +32,13 @@ </importedStreams> <queryExpressions><![CDATA[ from gradient_rif_processor - select cluster_id, network_partition_id, in_flight_request_count, + select cluster_id, instance_id, network_partition_id, in_flight_request_count, stratos:concat(cluster_id, '-' , network_partition_id) as request_grad_cluster_network insert into gradient_rif_concatinator; define partition request_grad_cluster_partition by gradient_rif_concatinator.request_grad_cluster_network; from gradient_rif_concatinator #window.stratos:gradient(1 min, in_flight_request_count) - select cluster_id,network_partition_id,in_flight_request_count as count + select cluster_id, instance_id, network_partition_id,in_flight_request_count as count insert into gradient_in_flight_requests partition by request_grad_cluster_partition; ]]></queryExpressions> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml index 101a70a..285679d 100644 --- a/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml +++ b/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml @@ -32,27 +32,27 @@ </importedStreams> <queryExpressions><![CDATA[ from health_second_der_request - select member_id, cluster_id, network_partition_id, health_description, value, + select member_id, cluster_id, instance_id, network_partition_id, health_description, value, stratos:concat(cluster_id, '-' ,network_partition_id) as health_second_der_cluster_network insert into health_second_der_concat; define partition health_second_der_cluster_partition by health_second_der_concat.health_second_der_cluster_network; from health_second_der_concat [health_description == 'memory_consumption'] - #window.stratos:secondDerivative(1 min, value) select cluster_id, network_partition_id, value as second_derivative_memory_consumption + #window.stratos:secondDerivative(1 min, value) select cluster_id, instance_id, network_partition_id, value as second_derivative_memory_consumption insert into second_derivative_memory_consumption_stats partition by health_second_der_cluster_partition; from health_second_der_concat [health_description == 'load_average'] - #window.stratos:secondDerivative(1 min, value) select cluster_id, network_partition_id, value as second_derivative_load_average + #window.stratos:secondDerivative(1 min, value) select cluster_id, instance_id, network_partition_id, value as second_derivative_load_average insert into second_derivative_load_average_stats partition by health_second_der_cluster_partition; define partition health_second_der_member_partition by health_second_der_request.member_id; from health_second_der_request [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) - select member_id, cluster_id, network_partition_id, value as member_second_derivative_memory_consumption + select member_id, cluster_id, instance_id, network_partition_id, value as member_second_derivative_memory_consumption insert into member_second_derivative_memory_consumption_stats partition by health_second_der_member_partition; from health_second_der_request [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) - select member_id, cluster_id, network_partition_id, value as member_second_derivative_load_average + select member_id, cluster_id, instance_id, network_partition_id, value as member_second_derivative_load_average insert into member_second_derivative_load_average_stats partition by health_second_der_member_partition;]]></queryExpressions> <exportedStreams> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml index 18e2eaf..5cf7a5a 100644 --- a/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml +++ b/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml @@ -32,12 +32,12 @@ </importedStreams> <queryExpressions><![CDATA[ from second_der_rif - select cluster_id, network_partition_id, in_flight_request_count, + select cluster_id, instance_id, network_partition_id, in_flight_request_count, stratos:concat(cluster_id, '-' ,network_partition_id) as rif_second_der_cluster_network insert into rif_second_der_concat; define partition rif_second_der_cluster_partition by rif_second_der_concat.rif_second_der_cluster_network; from rif_second_der_concat#window.stratos:secondDerivative(1 min, in_flight_request_count) - select cluster_id,network_partition_id,in_flight_request_count as count + select cluster_id, instance_id, network_partition_id,in_flight_request_count as count insert into second_derivative_in_flight_requests partition by rif_second_der_cluster_partition; ]]></queryExpressions> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml b/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml index a9472ef..6f2f853 100644 --- a/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml +++ b/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml @@ -31,6 +31,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String"/> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="active_instances_count" type="double"/> <property name="in_flight_request_count" type="double"/> @@ -47,6 +48,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String"/> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="count" type="double"/> </payloadData> @@ -61,6 +63,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String"/> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="instances_count" type="double"/> <property name="count" type="double"/> @@ -77,6 +80,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String"/> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="average_served_count" type="double"/> </payloadData> @@ -91,6 +95,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String"/> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="count" type="double"/> </payloadData> @@ -107,6 +112,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="member_id" type="String" /> <property name="partition_id" type="String" /> @@ -124,6 +130,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="average_load_average" type="double"/> </payloadData> @@ -138,6 +145,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String"/> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="average_memory_consumption" type="double"/> </payloadData> @@ -152,6 +160,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="gradient_load_average" type="double"/> </payloadData> @@ -166,6 +175,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="gradient_memory_consumption" type="double"/> </payloadData> @@ -180,6 +190,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="second_derivative_memory_consumption" type="double"/> </payloadData> @@ -194,6 +205,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="second_derivative_load_average" type="double"/> </payloadData> @@ -208,6 +220,7 @@ </correlationData> <payloadData> <property name="cluster_id" type="String"/> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="member_id" type="String"/> <property name="partition_id" type="String"/> @@ -226,6 +239,7 @@ <payloadData> <property name="member_id" type="String" /> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="member_average_load_average" type="double"/> </payloadData> @@ -241,6 +255,7 @@ <payloadData> <property name="member_id" type="String"/> <property name="cluster_id" type="String"/> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="member_average_memory_consumption" type="double"/> </payloadData> @@ -256,6 +271,7 @@ <payloadData> <property name="member_id" type="String" /> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="member_gradient_load_average" type="double"/> </payloadData> @@ -271,6 +287,7 @@ <payloadData> <property name="member_id" type="String" /> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="member_gradient_memory_consumption" type="double"/> </payloadData> @@ -286,6 +303,7 @@ <payloadData> <property name="member_id" type="String" /> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="member_second_derivative_memory_consumption" type="double"/> </payloadData> @@ -301,6 +319,7 @@ <payloadData> <property name="member_id" type="String" /> <property name="cluster_id" type="String" /> + <property name="instance_id" type="String"/> <property name="network_partition_id" type="String"/> <property name="member_second_derivative_load_average" type="double"/> </payloadData> http://git-wip-us.apache.org/repos/asf/stratos/blob/31b66a5c/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java ---------------------------------------------------------------------- diff --git a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java index b834ac0..a2b0904 100644 --- a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java +++ b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java @@ -213,9 +213,9 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run } log.info("Publishing member fault event for [member-id] " + memberId); - //TODO pass proper value for instance id - MemberFaultEvent memberFaultEvent = new MemberFaultEvent(member.getClusterId(), member.getMemberId(), - member.getPartitionId(), null, 0); + MemberFaultEvent memberFaultEvent = new MemberFaultEvent(member.getClusterId(), member.getInstanceId(), member.getMemberId(), + member.getPartitionId(), 0); + memberFaultEventMessageMap.put("message", memberFaultEvent); healthStatPublisher.publish(MemberFaultEventMap, true); }
