You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2013/12/12 11:50:35 UTC
[1/2] git commit: chaning the cep artifacts to use, cluster_id,
partition_id and fixing issues due to recent refactoring in CEP
artifacts
Updated Branches:
refs/heads/master 9648a38ce -> fddb157ab
chaning the cep artifacts to use, cluster_id, partition_id and fixing issues due to recent refactoring in CEP artifacts
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b7537667
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b7537667
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b7537667
Branch: refs/heads/master
Commit: b7537667ea0788ad75bd11862b53937e6e6c3ff0
Parents: 96c4f3c
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Dec 12 16:16:47 2013 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Dec 12 16:16:47 2013 +0530
----------------------------------------------------------------------
.../event-formatters/AverageLoadAverageEventFormatter.xml | 2 +-
.../AverageMemoryConsumptionEventFormatter.xml | 2 +-
.../event-formatters/FaultMessageEventFormatter.xml | 2 +-
.../GradientLoadAverageEventFormatter.xml | 2 +-
.../GradientMemoryConsumptionEventFormatter.xml | 2 +-
.../SecondDerivativeLoadAverageEventFormatter.xml | 2 +-
.../SecondDerivativeMemoryConsumptionEventFormatter.xml | 2 +-
.../cep/artifacts/execution-plans/AverageHeathRequest.xml | 6 +++---
.../artifacts/execution-plans/GradientOfHealthRequest.xml | 6 ++----
.../execution-plans/SecondDerivativeOfHealthRequest.xml | 4 ++--
.../stream-definitions/stream-manager-config.xml | 6 ------
.../cartridge/agent/health/publisher/HealthPublisher.java | 10 +++++-----
12 files changed, 19 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b7537667/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml
index 19593dc..09ab9ae 100644
--- a/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml
+++ b/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml
@@ -3,7 +3,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>{"average_load_average":{"member_id":"{{member_id}}","value":"{{average_load_average}}"}}</inline>
+ <inline>{"average_load_average":{"cluster_id":"{{cluster_id}}","partition_id":"{{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/incubator-stratos/blob/b7537667/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml
index 02776d4..62cc6ea 100644
--- a/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml
+++ b/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml
@@ -3,7 +3,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>{"average_memory_consumption":{"member_id":"{{member_id}}","value":"{{average_memory_consumption}}"}}</inline>
+ <inline>{"average_memory_consumption":{"cluster_id":"{{cluster_id}}","partition_id":"{{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/incubator-stratos/blob/b7537667/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml
index 3904b43..9d91cef 100644
--- a/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml
+++ b/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml
@@ -3,7 +3,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>{"member_fault":{"cluster_id":"{{cluster_id}}","member_id":"{{member_id}}"}}</inline>
+ <inline>{"member_fault":{"cluster_id":"{{cluster_id}}","partition_id":"{{partition_id}}","member_id":"{{member_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/incubator-stratos/blob/b7537667/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml
index 9b733f4..6d622eb 100644
--- a/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml
+++ b/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml
@@ -3,7 +3,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>{"gradient_load_average":{"member_id":"{{member_id}}","value":"{{gradient_load_average}}"}}</inline>
+ <inline>{"gradient_load_average":{"cluster_id":"{{cluster_id}}","partition_id":"{{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/incubator-stratos/blob/b7537667/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml
index f82112a..efd16eb 100644
--- a/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml
+++ b/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml
@@ -3,7 +3,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>{"gradient_memory_consumption":{"member_id":"{{member_id}}","value":"{{gradient_memory_consumption}}"}}</inline>
+ <inline>{"gradient_memory_consumption":{"cluster_id":"{{cluster_id}}","partition_id":"{{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/incubator-stratos/blob/b7537667/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml
index 1cd3d85..da2f5a7 100644
--- a/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml
+++ b/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml
@@ -3,7 +3,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>{"second_derivative_load_average":{"member_id":"{{member_id}}","value":"{{second_derivative_load_average}}"}}</inline>
+ <inline>{"second_derivative_load_average":{"cluster_id":"{{cluster_id}}","partition_id":"{{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/incubator-stratos/blob/b7537667/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
index 4ae867e..4c987fe 100644
--- a/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
+++ b/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
@@ -3,7 +3,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>{"second_derivative_memory_consumption":{"member_id":"{{member_id}}","value":"{{second_derivative_memory_consumption}}"}}</inline>
+ <inline>{"second_derivative_memory_consumption":{"cluster_id":"{{cluster_id}}","partition_id":"{{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/incubator-stratos/blob/b7537667/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml b/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
index 1a07286..3e33f0b 100644
--- a/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
+++ b/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
@@ -9,9 +9,9 @@
<importedStreams>
<stream as="healthStats1" name="cartridge_agent_health_stats" version="1.0.0"/>
</importedStreams>
- <queryExpressions><![CDATA[from healthStats1 [health_description == 'port_not_open'] select cluster_id,partition_id,member_id group by cluster_id,partition_id insert into fault_message;
- from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select cluster_id,partition_id,member_id, avg(value) as average_load_average group by cluster_id,partition_id insert into average_load_average_stats;
- from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select cluster_id,partition_id,member_id, avg(value) as average_memory_consumption group by cluster_id,partition_id insert into average_memory_consumption_stats;]]></queryExpressions>
+ <queryExpressions><![CDATA[from healthStats1 [health_description == 'port_not_open'] select cluster_id,partition_id,member_id insert into fault_message;
+ from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select cluster_id,partition_id,avg(value) as average_load_average group by cluster_id,partition_id insert into average_load_average_stats;
+ from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select cluster_id,partition_id,avg(value) as average_memory_consumption group by cluster_id,partition_id insert into average_memory_consumption_stats;]]></queryExpressions>
<exportedStreams>
<stream name="average_load_average_stats" passthroughFlow="disable"
valueOf="average_load_average_stats" version="1.0.0"/>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b7537667/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml b/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
index cc024ea..d83d76d 100644
--- a/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
+++ b/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
@@ -10,14 +10,12 @@
<stream as="healthStats2" name="cartridge_agent_health_stats" version="1.0.0"/>
</importedStreams>
<queryExpressions><![CDATA[
- from healthStats2 #window.stratos:faultHandling(1min, member_id) select cluster_id,partition_id,member_id group by cluster_id,partition_id insert into fault_message;
- from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select cluster_id,partition_id, member_id, value as gradient_load_average group by cluster_id,partition_id insert into gradient_load_average_stats;
- from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select cluster_id,partition_id,member_id, value as gradient_memory_consumption group by cluster_id,partition_id insert into gradient_memory_consumption_stats;]]></queryExpressions>
+ from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select cluster_id,partition_id,value as gradient_load_average group by cluster_id,partition_id insert into gradient_load_average_stats;
+ from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select cluster_id,partition_id,value as gradient_memory_consumption group by cluster_id,partition_id insert into gradient_memory_consumption_stats;]]></queryExpressions>
<exportedStreams>
<stream name="gradient_load_average_stats"
valueOf="gradient_load_average_stats" version="1.0.0"/>
<stream name="gradient_memory_consumption_stats"
valueOf="gradient_memory_consumption_stats" version="1.0.0"/>
- <stream name="fault_message" valueOf="fault_message" version="1.0.0"/>
</exportedStreams>
</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b7537667/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
index 0878d37..ce18f8e 100644
--- a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
+++ b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
@@ -10,8 +10,8 @@
<stream as="healthStats3" name="cartridge_agent_health_stats" version="1.0.0"/>
</importedStreams>
<queryExpressions><![CDATA[
- from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select cluster_id,partition_id,member_id, value as second_derivative_memory_consumption group by cluster_id,partition_id insert into second_derivative_memory_consumption_stats;
- from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select cluster_id,partition_id,member_id, value as second_derivative_load_average group by cluster_id,partition_id insert into second_derivative_load_average_stats;]]></queryExpressions>
+ from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select cluster_id,partition_id,value as second_derivative_memory_consumption group by cluster_id,partition_id insert into second_derivative_memory_consumption_stats;
+ from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select cluster_id,partition_id,value as second_derivative_load_average group by cluster_id,partition_id insert into second_derivative_load_average_stats;]]></queryExpressions>
<exportedStreams>
<stream name="second_derivative_memory_consumption_stats"
valueOf="second_derivative_memory_consumption_stats" version="1.0.0"/>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b7537667/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml b/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
index fb467fe..f6c280e 100755
--- a/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
+++ b/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
@@ -84,7 +84,6 @@
<payloadData>
<property name="cluster_id" type="String" />
<property name="partition_id" type="String"/>
- <property name="member_id" type="String"/>
<property name="average_load_average" type="double"/>
</payloadData>
</streamDefinition>
@@ -99,7 +98,6 @@
<payloadData>
<property name="cluster_id" type="String"/>
<property name="partition_id" type="String"/>
- <property name="member_id" type="String"/>
<property name="average_memory_consumption" type="double"/>
</payloadData>
</streamDefinition>
@@ -114,7 +112,6 @@
<payloadData>
<property name="cluster_id" type="String" />
<property name="partition_id" type="String"/>
- <property name="member_id" type="String"/>
<property name="gradient_load_average" type="double"/>
</payloadData>
</streamDefinition>
@@ -129,7 +126,6 @@
<payloadData>
<property name="cluster_id" type="String" />
<property name="partition_id" type="String"/>
- <property name="member_id" type="String"/>
<property name="gradient_memory_consumption" type="double"/>
</payloadData>
</streamDefinition>
@@ -144,7 +140,6 @@
<payloadData>
<property name="cluster_id" type="String" />
<property name="partition_id" type="String"/>
- <property name="member_id" type="String"/>
<property name="second_derivative_memory_consumption" type="double"/>
</payloadData>
</streamDefinition>
@@ -159,7 +154,6 @@
<payloadData>
<property name="cluster_id" type="String" />
<property name="partition_id" type="String"/>
- <property name="member_id" type="String"/>
<property name="second_derivative_load_average" type="double"/>
</payloadData>
</streamDefinition>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b7537667/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisher.java
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisher.java b/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisher.java
index b9f1258..096004f 100644
--- a/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisher.java
+++ b/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisher.java
@@ -63,11 +63,11 @@ public class HealthPublisher implements Observer {
" 'description': 'health stats'," +
" 'metaData':[]," +
" 'payloadData':[" +
- " {'name':'health_description','type':'STRING'}," +
- " {'name':'value','type':'DOUBLE'}," +
- " {'name':'member_id','type':'STRING'}," +
" {'name':'cluster_id','type':'STRING'}," +
- " {'name':'partition_id','type':'STRING'}" +
+ " {'name':'partition_id','type':'STRING'}," +
+ " {'name':'member_id','type':'STRING'}," +
+ " {'name':'health_description','type':'STRING'}," +
+ " {'name':'value','type':'DOUBLE'}" +
" ]" +
"}";
asyncDataPublisher.addStreamDefinition(streamDefinition, DATA_STREAM_NAME, VERSION);
@@ -101,7 +101,7 @@ public class HealthPublisher implements Observer {
for (Map.Entry<String, Double> entry : stats.entrySet()) {
- Object[] payload = new Object[]{entry.getKey(), entry.getValue(), memberID, clusterID,partitionId};
+ Object[] payload = new Object[]{clusterID,partitionId,memberID,entry.getKey(), entry.getValue()};
Event event = eventObject(null, null, payload, new HashMap<String, String>());
try {
asyncDataPublisher.publish(DATA_STREAM_NAME, VERSION, event);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by pr...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fddb157a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fddb157a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fddb157a
Branch: refs/heads/master
Commit: fddb157ab5a95a432216be6053bd62cb1913f149
Parents: b753766 9648a38
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Dec 12 16:20:15 2013 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Dec 12 16:20:15 2013 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/cli/RestCommandLineService.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------