You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/12/02 16:53:52 UTC
git commit: Add cluster_id to fault message in CEP config
Updated Branches:
refs/heads/master 0fc083374 -> 7ce95692f
Add cluster_id to fault message in CEP config
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7ce95692
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7ce95692
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7ce95692
Branch: refs/heads/master
Commit: 7ce95692f8d0d36478671d5015788d0d9d2062f6
Parents: 0fc0833
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Mon Dec 2 21:22:55 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Mon Dec 2 21:22:55 2013 +0530
----------------------------------------------------------------------
.../artifacts/eventformatters/FaultMessageEventFormatter.xml | 2 +-
.../cep/artifacts/executionplans/AverageHeathRequest.xml | 2 +-
.../cep/artifacts/executionplans/GradientOfHealthRequest.xml | 2 +-
.../modules/cartridge-agent/ec2/php/cartridge-agent.sh | 2 +-
.../modules/health-stats/src/main/bin/health-publisher.sh | 2 +-
.../cartridge/agent/health/publisher/HealthPublisher.java | 6 ++++--
6 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ce95692/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
index eae24c9..fc52590 100644
--- a/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
+++ b/extensions/cep/artifacts/eventformatters/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>{"fault_message":{"member_id":"{{member_id}}"}}</inline>
+ <inline>{"fault_message":{"member_id":"{{member_id}}", "cluster_id":"{{cluster_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/7ce95692/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml b/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
index b40f3bb..ccca3fd 100644
--- a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
+++ b/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
@@ -10,7 +10,7 @@
<stream as="healthStats1" name="stratos.agent.health.stats" version="1.0.0"/>
</importedStreams>
<queryExpressions><![CDATA[define partition healthStats1Partition by member_id;
- from healthStats1 [health_description == 'port_not_open'] select member_id insert into fault_message partition by healthStats1Partition;
+ from healthStats1 [health_description == 'port_not_open'] select member_id, cluster_id insert into fault_message partition by healthStats1Partition;
from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select member_id, avg(value) as average_load_average insert into average_load_average_stats partition by healthStats1Partition;
from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select member_id, avg(value) as average_memory_consumption insert into average_memory_consumption_stats partition by healthStats1Partition;]]></queryExpressions>
<exportedStreams>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ce95692/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
index 4e27fb7..4a5d2cb 100644
--- a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
+++ b/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
@@ -10,7 +10,7 @@
<stream as="healthStats2" name="stratos.agent.health.stats" version="1.0.0"/>
</importedStreams>
<queryExpressions><![CDATA[define partition healthStats2Partition by member_id;
- from healthStats2 #window.stratos:faultHandling(1min, member_id) select member_id insert into fault_message partition by healthStats2Partition;
+ from healthStats2 #window.stratos:faultHandling(1min, member_id) select member_id, cluster_id insert into fault_message partition by healthStats2Partition;
from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select member_id, value as gradient_load_average insert into gradient_load_average_stats partition by healthStats2Partition;
from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select member_id, value as gradient_memory_consumption insert into gradient_memory_consumption_stats partition by healthStats2Partition;]]></queryExpressions>
<exportedStreams>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ce95692/products/cartridge-agent/modules/cartridge-agent/ec2/php/cartridge-agent.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/cartridge-agent/ec2/php/cartridge-agent.sh b/products/cartridge-agent/modules/cartridge-agent/ec2/php/cartridge-agent.sh
index 04e983a..13fa2e2 100755
--- a/products/cartridge-agent/modules/cartridge-agent/ec2/php/cartridge-agent.sh
+++ b/products/cartridge-agent/modules/cartridge-agent/ec2/php/cartridge-agent.sh
@@ -154,6 +154,6 @@ popd
pushd $health_publisher_path/bin
echo "Executing: health-publisher.sh"
-sh health-publisher.sh $MEMBER_ID $CEP_IP $CEP_PORT
+sh health-publisher.sh $MEMBER_ID $CEP_IP $CEP_PORT $PORTS $CLUSTER_ID
echo "Health stat published" | tee -a $LOG
popd
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ce95692/products/cartridge-agent/modules/health-stats/src/main/bin/health-publisher.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/health-stats/src/main/bin/health-publisher.sh b/products/cartridge-agent/modules/health-stats/src/main/bin/health-publisher.sh
index 17b9521..cd70763 100755
--- a/products/cartridge-agent/modules/health-stats/src/main/bin/health-publisher.sh
+++ b/products/cartridge-agent/modules/health-stats/src/main/bin/health-publisher.sh
@@ -28,7 +28,7 @@ class_path=${lib_path}andes-client-0.13.wso2v8.jar:${lib_path}ant-1.7.0.jar:${li
current_path=`pwd`
-java -cp $class_path -Dmember.id=$1 -Dkey.file.path=$current_path/../security/client-truststore.jks -Dthrift.receiver.ip=$2 -Dthrift.receiver.port=$3 -Dopen.ports=$4 org.apache.stratos.cartridge.agent.health.publisher.Main $*
+java -cp $class_path -Dmember.id=$1 -Dkey.file.path=$current_path/../security/client-truststore.jks -Dthrift.receiver.ip=$2 -Dthrift.receiver.port=$3 -Dopen.ports=$4 -Dcluster.id=$5 org.apache.stratos.cartridge.agent.health.publisher.Main $*
echo "Health publisher completed"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ce95692/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 671aa85..38955ef 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
@@ -70,7 +70,8 @@ public class HealthPublisher implements Observer {
" 'payloadData':[" +
" {'name':'health_description','type':'STRING'}," +
" {'name':'value','type':'DOUBLE'}," +
- " {'name':'member_id','type':'STRING'}" +
+ " {'name':'member_id','type':'STRING'}," +
+ " {'name':'cluster_id','type':'STRING'}" +
" ]" +
"}";
asyncDataPublisher.addStreamDefinition(streamDefinition, CALL_CENTER_DATA_STREAM, VERSION);
@@ -99,10 +100,11 @@ public class HealthPublisher implements Observer {
private void publishEvents(Map<String, Double> stats) {
String memberID = System.getProperty("member.id");
+ String clusterID = System.getProperty("cluster.id");
for (Map.Entry<String, Double> entry : stats.entrySet()) {
- Object[] payload = new Object[]{entry.getKey(), entry.getValue(), memberID};
+ Object[] payload = new Object[]{entry.getKey(), entry.getValue(), memberID, clusterID};
Event event = eventObject(null, null, payload, new HashMap<String, String>());
try {
asyncDataPublisher.publish(CALL_CENTER_DATA_STREAM, VERSION, event);