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/11/12 07:28:32 UTC
[1/3] git commit: Modified health-publisher.sh to get CEP_PORT,
CEP_IP & MEMBER_ID as arguments Publish Load Average of an instance
to CEP
Updated Branches:
refs/heads/master 2ed82b3c5 -> 127a11b12
Modified health-publisher.sh to get CEP_PORT, CEP_IP & MEMBER_ID as arguments
Publish Load Average of an instance to CEP
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5030b0ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5030b0ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5030b0ab
Branch: refs/heads/master
Commit: 5030b0ab3882e8146304db25b464eeb33f06be49
Parents: 5762983
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Tue Nov 12 11:50:07 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Tue Nov 12 11:50:07 2013 +0530
----------------------------------------------------------------------
.../src/main/bin/health-publisher.sh | 6 +++++-
.../agent/health/publisher/HealthPublisher.java | 1 +
.../health/publisher/HealthPublisherClient.java | 20 ++++++++++++++------
3 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5030b0ab/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 ce3e36d..2573f32 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
@@ -21,10 +21,14 @@
# --------------------------------------------------------------
echo "Starting health publisher..."
+
lib_path=./../lib/
+
class_path=${lib_path}andes-client-0.13.wso2v8.jar:${lib_path}ant-1.7.0.jar:${lib_path}ant-1.7.0.wso2v1.jar:${lib_path}ant-launcher-1.7.0.jar:${lib_path}apache-stratos-health-publisher-4.0.0-SNAPSHOT.jar:${lib_path}axiom-1.2.11.wso2v4.jar:${lib_path}axiom-api-1.2.11.jar:${lib_path}axiom-impl-1.2.11.jar:${lib_path}axis2-1.6.1.wso2v10.jar:${lib_path}commons-cli-1.0.jar:${lib_path}commons-codec-1.8.jar:${lib_path}commons-fileupload-1.2.0.wso2v1.jar:${lib_path}commons-fileupload-1.2.jar:${lib_path}commons-httpclient-3.1.0.wso2v2.jar:${lib_path}commons-httpclient-3.1.jar:${lib_path}commons-io-2.0.jar:${lib_path}commons-lang-1.0.jar:${lib_path}commons-lang3-3.1.jar:${lib_path}commons-logging-1.1.1.jar:${lib_path}commons-pool-1.5.0.wso2v1.jar:${lib_path}commons-pool-1.5.jar:${lib_path}dom4j-1.6.1.jar:${lib_path}geronimo-activation_1.1_spec-1.0.2.jar:${lib_path}geronimo-javamail_1.4_spec-1.6.jar:${lib_path}geronimo-jms_1.1_spec-1.1.0.wso2v1.jar:${lib_path}geronimo-jms_1.1_spec-1.1.jar:${lib
_path}geronimo-stax-api_1.0_spec-1.0.1.jar:${lib_path}gson-2.2.4.jar:${lib_path}httpclient-4.1.1-wso2v1.jar:${lib_path}httpclient-4.2.5.jar:${lib_path}httpcore-4.1.0-wso2v1.jar:${lib_path}httpcore-4.2.4.jar:${lib_path}icu4j-2.6.1.jar:${lib_path}javax.servlet-3.0.0.v201112011016.jar:${lib_path}jaxen-1.1.1.jar:${lib_path}jdom-1.0.jar:${lib_path}jline-0.9.94.jar:${lib_path}json-2.0.0.wso2v1.jar:${lib_path}junit-3.8.1.jar:${lib_path}libthrift-0.7.wso2v1.jar:${lib_path}libthrift-0.9.1.jar:${lib_path}log4j-1.2.13.jar:${lib_path}not-yet-commons-ssl-0.3.9.jar:${lib_path}org.apache.log4j-1.2.13.v200706111418.jar:${lib_path}org.apache.stratos.messaging-4.0.0-SNAPSHOT.jar:${lib_path}org.eclipse.osgi-3.8.1.v20120830-144521.jar:${lib_path}org.eclipse.osgi.services-3.3.100.v20120522-1822.jar:${lib_path}org.wso2.carbon.base-4.2.0.jar:${lib_path}org.wso2.carbon.core.common-4.2.0.jar:${lib_path}org.wso2.carbon.databridge.agent.thrift-4.2.0.jar:${lib_path}org.wso2.carbon.databridge.commons-4.2.0.jar:
${lib_path}org.wso2.carbon.databridge.commons.thrift-4.2.0.jar:${lib_path}org.wso2.carbon.logging-4.1.0.jar:${lib_path}org.wso2.carbon.queuing-4.2.0.jar:${lib_path}org.wso2.carbon.registry.api-4.2.0.jar:${lib_path}org.wso2.carbon.securevault-4.2.0.jar:${lib_path}org.wso2.carbon.user.api-4.2.0.jar:${lib_path}org.wso2.carbon.utils-4.2.0.jar:${lib_path}org.wso2.securevault-1.0.0-wso2v2.jar:${lib_path}slf4j-1.5.10.wso2v1.jar:${lib_path}slf4j-api-1.7.5.jar:${lib_path}slf4j-log4j12-1.7.5.jar:${lib_path}smack-3.0.4.wso2v1.jar:${lib_path}smackx-3.0.4.wso2v1.jar:${lib_path}wstx-asl-3.2.9.jar:${lib_path}xalan-2.6.0.jar:${lib_path}xercesImpl-2.6.2.jar:${lib_path}xml-apis-1.3.02.jar:${lib_path}xmlParserAPIs-2.6.2.jar:${lib_path}xom-1.0.jar
+
current_path=`pwd`
-java -cp $class_path -Dkey.file.path=$current_path/../security/client-truststore.jks -Dthrift.receiver.ip=localhost -Dthrift.receiver.port=7615 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 org.apache.stratos.cartridge.agent.health.publisher.Main $*
echo "Health publisher completed"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5030b0ab/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 d5bb4e9..7d56d06 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
@@ -20,6 +20,7 @@
package org.apache.stratos.cartridge.agent.health.publisher;
import java.io.File;
+import java.lang.Double;
import java.lang.NullPointerException;
import java.lang.String;
import java.util.HashMap;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5030b0ab/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisherClient.java
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisherClient.java b/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisherClient.java
index 1cf488c..c97586d 100644
--- a/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisherClient.java
+++ b/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisherClient.java
@@ -20,9 +20,13 @@
package org.apache.stratos.cartridge.agent.health.publisher;
import java.io.*;
+import java.lang.Double;
+import java.lang.Integer;
import java.lang.Runtime;
+import java.lang.System;
import java.util.HashMap;
import java.util.Map;
+import java.lang.management.ManagementFactory;
public class HealthPublisherClient {
@@ -30,16 +34,20 @@ public class HealthPublisherClient {
public Object getHealthStats() {
+ String memberID = System.getProperty("member.id");
+
Runtime runtime = Runtime.getRuntime();
Map<String, Integer> statsMap = new HashMap<String, Integer>();
- statsMap.put("Available Processors", (int)runtime.availableProcessors());
- statsMap.put("Total Memory", (int)(runtime.totalMemory() / MB));
- statsMap.put("Max Memory", (int)(runtime.maxMemory() / MB));
- statsMap.put("Used Memory", (int)((runtime.totalMemory() - runtime.freeMemory()) / MB));
- statsMap.put("Free Memory", (int)(runtime.freeMemory() / MB));
-
+ //statsMap.put("Available Processors", (int)runtime.availableProcessors());
+ statsMap.put("total_memory", (int)(runtime.totalMemory() / MB));
+ statsMap.put("max_memory", (int)(runtime.maxMemory() / MB));
+ statsMap.put("used_memory", (int)((runtime.totalMemory() - runtime.freeMemory()) / MB));
+ statsMap.put("free_memory", (int)(runtime.freeMemory() / MB));
+ statsMap.put("load_average", (int)ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage());
+ statsMap.put("member_id", Integer.parseInt(memberID));
+
Object statObj = (Object)statsMap;
return statObj;
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ma...@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/127a11b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/127a11b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/127a11b1
Branch: refs/heads/master
Commit: 127a11b12b7cb47d018cf4c4bb5fb5eb1747f275
Parents: 9fdb7d4 2ed82b3
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Tue Nov 12 11:55:39 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Tue Nov 12 11:55:39 2013 +0530
----------------------------------------------------------------------
.../src/main/resources/autoscaler.drl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: Modified cartridge-agent.sh according to health
publisher module
Posted by ma...@apache.org.
Modified cartridge-agent.sh according to health publisher module
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9fdb7d4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9fdb7d4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9fdb7d4c
Branch: refs/heads/master
Commit: 9fdb7d4c70abca04465f225c3a8fe9dc11dcbd00
Parents: 5030b0a
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Tue Nov 12 11:54:51 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Tue Nov 12 11:54:51 2013 +0530
----------------------------------------------------------------------
.../modules/cartridge-agent/ec2/php/cartridge-agent.sh | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9fdb7d4c/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 b4019a4..d9e56b6 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
@@ -29,6 +29,7 @@ export LOG=/var/log/apache-stratos/cartridge-agent.log
instance_path=/opt/apache-stratos-cartridge-agent # Cartridge agent home
event_publisher_path=/opt/apache-stratos-cartridge-agent/event-publisher # Event publisher home
event_subscriber_path=/opt/apache-stratos-cartridge-agent/event-subscriber # Event subscriber home
+health_publisher_path=/opt/apache-stratos-cartridge-agent/health-publisher # Health publisher home
# ---------------------------------------------
# Download payload.zip
@@ -274,3 +275,8 @@ sh event-publisher.sh $MB_IP $MB_PORT $event_class_name $event_json_path
echo "Event published" | tee -a $LOG
popd
+pushd $health_publisher_path/bin
+echo "Executing: health-publisher.sh"
+sh health-publisher.sh $MEMBER_ID $CEP_IP $CEP_PORT
+echo "Health stat published" | tee -a $LOG
+popd