stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject stratos git commit: Updating instance_id -> cluster_instance_id change in cep artifacts
Date Sat, 20 Dec 2014 22:46:16 GMT
Repository: stratos
Updated Branches:
  refs/heads/master d45f4fd35 -> 23d2a44a6


Updating instance_id -> cluster_instance_id change in cep artifacts


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/23d2a44a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/23d2a44a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/23d2a44a

Branch: refs/heads/master
Commit: 23d2a44a6091c69cd484f07b944e8376465048fb
Parents: d45f4fd
Author: Imesh Gunaratne <imesh@apache.org>
Authored: Sun Dec 21 04:16:05 2014 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Sun Dec 21 04:16:05 2014 +0530

----------------------------------------------------------------------
 .../AverageInFlightRequestsEventFormatter.xml           |  2 +-
 .../AverageLoadAverageEventFormatter.xml                |  2 +-
 .../AverageMemoryConsumptionEventFormatter.xml          |  2 +-
 .../AverageServedRequestsEventFormatter.xml             |  2 +-
 .../eventformatters/FaultMessageEventFormatter.xml      |  2 +-
 .../GradientInFlightRequestsEventFormatter.xml          |  2 +-
 .../GradientLoadAverageEventFormatter.xml               |  2 +-
 .../GradientMemoryConsumptionEventFormatter.xml         |  2 +-
 .../MemberAverageLoadAverageEventFormatter.xml          |  2 +-
 .../MemberAverageMemoryConsumptionEventFormatter.xml    |  2 +-
 .../MemberGradientLoadAverageEventFormatter.xml         |  2 +-
 .../MemberGradientMemoryConsumptionEventFormatter.xml   |  2 +-
 .../MemberSecondDerivativeLoadAverageEventFormatter.xml |  2 +-
 ...rSecondDerivativeMemoryConsumptionEventFormatter.xml |  2 +-
 .../SecondDerivativeInFlightRequestsEventFormatter.xml  |  2 +-
 .../SecondDerivativeLoadAverageEventFormatter.xml       |  2 +-
 .../SecondDerivativeMemoryConsumptionEventFormatter.xml |  2 +-
 .../artifacts/executionplans/AverageHeathRequest.xml    | 12 ++++++------
 .../executionplans/AverageInFlightRequestsFinder.xml    | 10 +++++-----
 .../executionplans/GradientOfHealthRequest.xml          | 12 ++++++------
 .../executionplans/GradientOfRequestsInFlightFinder.xml |  4 ++--
 .../executionplans/SecondDerivativeOfHealthRequest.xml  | 10 +++++-----
 .../SecondDerivativeOfRequestsInFlightFinder.xml        |  4 ++--
 23 files changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/23d2a44a/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml
index 4a5317b..26c8f66 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}}","instanceId":"{{instance_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}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml
index 0d7da89..a0e2052 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}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{average_load_average}}"}}}</inline>
+    <inline>{"org.apache.stratos.messaging.event.health.stat.AverageLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml
index 2624a29..cbcab0a 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}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{average_memory_consumption}}"}}}</inline>
+    <inline>{"org.apache.stratos.messaging.event.health.stat.AverageMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/AverageServedRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/AverageServedRequestsEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/AverageServedRequestsEventFormatter.xml
index 513d503..b76c40b 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}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{average_served_count}}"}}}</inline>
+        <inline>{"org.apache.stratos.messaging.event.health.stat.AverageRequestsServingCapabilityEvent":{"message":{"clusterId":"{{cluster_id}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
index e5384a6..96264ca 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}}","instanceId":"{{instance_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}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml
index c225b33..2b5045b 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}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{count}}"}}}</inline>
+    <inline>{"org.apache.stratos.messaging.event.health.stat.GradientOfRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml
index 5cb14e8..7fa3d7a 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}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{gradient_load_average}}"}}}</inline>
+    <inline>{"org.apache.stratos.messaging.event.health.stat.GradientOfLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml
index c749474..8c3b871 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}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{gradient_memory_consumption}}"}}}</inline>
+    <inline>{"org.apache.stratos.messaging.event.health.stat.GradientOfMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml
index aa3c880..cab6df6 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}}","instanceId":"{{instance_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}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml
index dd8cb3d..7f6e1f8 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}}","instanceId":"{{instance_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}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml
index 6e039b6..af73b46 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}}","instanceId":"{{instance_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}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml
index ad95496..702f149 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}}","instanceId":"{{instance_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}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
index 7e81ae4..5281652 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}}","instanceId":"{{instance_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}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
index d5b93a9..2e32be3 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}}","instanceId":"{{instance_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}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml
index 41be357..61862d1 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}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{count}}"}}}</inline>
+    <inline>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
index 5113345..3dc4a74 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}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{second_derivative_load_average}}"}}}</inline>
+    <inline>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
b/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
index 0cd35bc..bb0f70c 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}}","instanceId":"{{instance_id}}","networkPartitionId":"{{network_partition_id}}","value":"{{second_derivative_memory_consumption}}"}}}</inline>
+    <inline>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","clusterInstanceId":"{{cluster_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/23d2a44a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml b/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
index 23353f3..0326f05 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, instance_id, network_partition_id, member_id, partition_id insert into
fault_message;
+		select cluster_id, cluster_instance_id, network_partition_id, member_id, partition_id insert
into fault_message;
 	from health_avg_processsor
-  		select cluster_id, instance_id, network_partition_id, member_id, partition_id, health_description,
value,
+  		select cluster_id, cluster_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, instance_id, network_partition_id, avg(value)
as average_load_average
+		#window.timeBatch(1 min) select cluster_id, cluster_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, instance_id, network_partition_id,
avg(value) as member_average_load_average
+		#window.timeBatch(1 min) select member_id, cluster_id, cluster_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, instance_id, network_partition_id,
avg(value) as member_average_memory_consumption
+		#window.timeBatch(1 min) select member_id, cluster_id, cluster_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, instance_id, network_partition_id, avg(value)
as average_memory_consumption
+		#window.timeBatch(1 min) select cluster_id, cluster_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/23d2a44a/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml b/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml
index fbc605d..e9607a3 100644
--- a/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml
+++ b/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml
@@ -32,20 +32,20 @@
   </importedStreams>
   <queryExpressions><![CDATA[ 
 	from avg_rif_stat
-		select cluster_id, instance_id, network_partition_id,active_instances_count, in_flight_request_count,served_request_count,
-		stratos:concat(cluster_id, '-' ,instance_id) as avg_rif_cluster_network
+		select cluster_id, cluster_instance_id, network_partition_id,active_instances_count, in_flight_request_count,served_request_count,
+		stratos:concat(cluster_id, '-' ,cluster_instance_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, 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
+		select cluster_id, cluster_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, instance_id, network_partition_id,instances_count, served_count,
+	    	select cluster_id, cluster_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)
-		select cluster_id, instance_id, network_partition_id, avg(requests_per_instance) as average_served_count
+		select cluster_id, cluster_instance_id, network_partition_id, avg(requests_per_instance)
as average_served_count
 		insert into average_served_request_count;]]></queryExpressions>
   <exportedStreams>
     <stream name="average_in_flight_requests"

http://git-wip-us.apache.org/repos/asf/stratos/blob/23d2a44a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
index 353c6d4..df6004c 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, instance_id, network_partition_id,
member_id, partition_id
+  		#window.stratos:faultHandling(1min, member_id) select cluster_id, cluster_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, instance_id, network_partition_id, member_id, partition_id, health_description,
value,
+  		select cluster_id, cluster_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, instance_id, network_partition_id,
value as gradient_load_average
+		#window.stratos:gradient(1 min, value) select cluster_id, cluster_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, instance_id, network_partition_id,
value as member_gradient_load_average
+		#window.stratos:gradient(1 min, value) select member_id, cluster_id, cluster_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, instance_id, network_partition_id,
value as member_gradient_memory_consumption
+		#window.stratos:gradient(1 min, value) select member_id, cluster_id, cluster_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, instance_id, network_partition_id,
value as gradient_memory_consumption
+		#window.stratos:gradient(1 min, value) select cluster_id, cluster_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/23d2a44a/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
b/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
index c4ea5eb..fff4a8a 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, instance_id, network_partition_id, in_flight_request_count,
+                select cluster_id, cluster_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, instance_id, network_partition_id,in_flight_request_count
as count
+                select cluster_id, cluster_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/23d2a44a/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
index 285679d..b40b21e 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, instance_id, network_partition_id, health_description, value,
+		select member_id, cluster_id, cluster_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, instance_id, network_partition_id,
value as second_derivative_memory_consumption
+		#window.stratos:secondDerivative(1 min, value) select cluster_id, cluster_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, instance_id, network_partition_id,
value as second_derivative_load_average
+		#window.stratos:secondDerivative(1 min, value) select cluster_id, cluster_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, instance_id, network_partition_id, value as member_second_derivative_memory_consumption
+		select member_id, cluster_id, cluster_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, instance_id, network_partition_id, value as member_second_derivative_load_average
+		select member_id, cluster_id, cluster_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/23d2a44a/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
b/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
index 5cf7a5a..157fbe3 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, instance_id, network_partition_id, in_flight_request_count,
+		select cluster_id, cluster_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, instance_id, network_partition_id,in_flight_request_count as count
+		select cluster_id, cluster_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>


Mime
View raw message