Merge pull request #10 from uavorg/master

update

com.creditease.uav.agent.buildComponent/bin/run.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #NOT READY,PLEASE REFINE THIS
 
 working_directory=$(pwd)
@@ -9,16 +9,17 @@ if [ "$1" == "--no-watch" ]; then
 fi
 
 echo $4
+executeJava=
 if [ -d "$4" ]; then
     export JAVA_HOME=$4
     export JRE_HOME=$JAVA_HOME/jre 
     export PATH=$JAVA_HOME/bin:$PATH 
-    export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH 
+    export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
+    executeJava="java"
 fi
 
-javaHomeArray=(/opt/jdk1.7.0_45 /opt/jdk1.7.0_65 /opt/jdk1.7.0_71 /opt/jdk1.7.0_79 /opt/jdk1.7.0_80 /app/jdk1.7.0_79 /app/jdk1.7.0_80 /opt/jdk1.8.0_77 /opt/jdk1.8.0_121 /opt/jdk1.8.0_131)
-executeJava="java"
-
+if [ -z $executeJava ];then
+javaHomeArray=(/opt/jdk1.7.0_45 /opt/jdk1.7.0_65 /opt/jdk1.7.0_71 /opt/jdk1.7.0_79 /opt/jdk1.7.0_80 /opt/jdk1.8.0_77 /opt/jdk1.8.0_121 /opt/jdk1.8.0_131 /app/jdk1.7.0_79 /app/jdk1.7.0_80)
 for jhome in ${javaHomeArray[@]}
 do
     tmp="$jhome/bin/java"
@@ -27,6 +28,7 @@ do
         break
     fi
 done
+fi
 
 echo "using $executeJava"
 

com.creditease.uav.agent.buildComponent/bin/run4docker.sh

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 #NOT READY,PLEASE REFINE THIS
 
-UAVPATH=/opt
+UAVBASE=/app
 HOSTNAME=`hostname`
 
 working_directory=$(pwd)
@@ -12,16 +12,18 @@ if [ "$1" == "--no-watch" ]; then
 fi 
 
 echo $4
+executeJava="java"
+jhome=""
 if [ -d "$4" ]; then
     export JAVA_HOME=$4
     export JRE_HOME=$JAVA_HOME/jre 
     export PATH=$JAVA_HOME/bin:$PATH 
-    export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH 
+    export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
+    jhome=$4
 fi
 
-javaHomeArray=(/opt/jdk1.7.0_45 /opt/jdk1.7.0_65 /opt/jdk1.7.0_71 /opt/jdk1.7.0_79 /opt/jdk1.7.0_80 /app/jdk1.7.0_79 /app/jdk1.7.0_80 /opt/jdk1.8.0_77 /opt/jdk1.8.0_121 /opt/jdk1.8.0_131)
-executeJava="java"
-
+if [ -z $jhome ];then
+javaHomeArray=(/opt/jdk1.7.0_45 /opt/jdk1.7.0_65 /opt/jdk1.7.0_71 /opt/jdk1.7.0_79 /opt/jdk1.7.0_80 /opt/jdk1.8.0_77 /opt/jdk1.8.0_121 /opt/jdk1.8.0_131 /app/jdk1.7.0_79 /app/jdk1.7.0_80)
 for jhome in ${javaHomeArray[@]}
 do
     tmp="$jhome/bin/java"
@@ -30,20 +32,26 @@ do
         break
     fi
 done
+fi
 
 echo "using $executeJava"
 
-netcardIndex=0
-if [ $# -gt 1 ]; then
-    netcardIndex=$3
+netcardIndex=
+netcardName=
+if [ $# -gt 2 ]; then
+    if [[ $3 =~ ^[0-9]$ ]]; then 
+        netcardIndex=$3
+    else
+        netcardName=$3
+    fi
 fi
-echo $netcardIndex
-cd .. 
-export CLASSPATH=$UAVPATH/uav/uavagent/bin/com.creditease.uav.base-1.0-boot.jar 
 
+cd .. 
+export CLASSPATH=$UAVBASE/uav/uavagent/bin/com.creditease.uav.base-1.0-boot.jar 
 echo $CLASSPATH
-echo "127.0.0.1 $HOSTNAME">> /etc/hosts
+
+echo "127.0.0.1 $HOSTNAME">>/etc/hosts
 
-javaAgent="-javaagent:$UAVPATH/uav/uavmof/com.creditease.uav.agent/com.creditease.uav.monitorframework.agent-1.0-agent.jar"
+javaAgent="-javaagent:$UAVBASE/uav/uavmof/com.creditease.uav.agent/com.creditease.uav.monitorframework.agent-1.0-agent.jar"
 javaOpts="-server -Xms64m -Xmx256m -Xss256k -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:CMSIncrementalDutyCycle=10 -XX:+UseParNewGC -XX:+UseCMSCompactAtFullCollection -XX:-CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=0 -XX:CMSInitiatingOccupancyFraction=70 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=." 
-$executeJava $javaAgent $javaOpts -XX:OnOutOfMemoryError='kill -9 %p' -DNetCardIndex=$netcardIndex -DJAppID=$2 -DJAppGroup=UNKNOWN -classpath $CLASSPATH com.creditease.mscp.boot.MSCPBoot -p $1
+$executeJava $javaAgent $javaOpts -XX:OnOutOfMemoryError='kill -9 %p' -DNetCardIndex=$netcardIndex -DNetCardName=$netcardName -DJAppID=$2 -DDeploymentType=container -classpath $CLASSPATH com.creditease.mscp.boot.MSCPBoot -p $1

com.creditease.uav.agent.buildComponent/bin/run4k8s.sh

@@ -1,8 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 #NOT READY,PLEASE REFINE THIS
 
-UAVPATH=/app
-HOSTNAMEFORGROUP=$HOSTNAME
+UAVBASE=/app
 
 working_directory=$(pwd)
 proc_watcher="yes"
@@ -12,38 +11,42 @@ if [ "$1" == "--no-watch" ]; then
 fi 
 
 echo $4
+executeJava="java"
+jhome=""
 if [ -d "$4" ]; then
     export JAVA_HOME=$4
     export JRE_HOME=$JAVA_HOME/jre 
     export PATH=$JAVA_HOME/bin:$PATH 
-    export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH 
+    export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
+    jhome=$4
 fi
 
-javaHomeArray=(/opt/jdk1.7.0_45 /opt/jdk1.7.0_65 /opt/jdk1.7.0_71 /opt/jdk1.7.0_79 /opt/jdk1.7.0_80 /app/jdk1.7.0_79 /app/jdk1.7.0_80 /opt/jdk1.8.0_77 /opt/jdk1.8.0_121 /opt/jdk1.8.0_131)
-executeJava="java"
-
+if [ -z $javaHome ];then
+javaHomeArray=(/opt/jdk1.7.0_45 /opt/jdk1.7.0_65 /opt/jdk1.7.0_71 /opt/jdk1.7.0_79 /opt/jdk1.7.0_80 /opt/jdk1.8.0_77 /opt/jdk1.8.0_121 /opt/jdk1.8.0_131 /app/jdk1.7.0_79 /app/jdk1.7.0_80)
 for jhome in ${javaHomeArray[@]}
 do
     tmp="$jhome/bin/java"
     if [ -x "$tmp" ]; then
-        executeJava=$tmp        
+        executeJava=$tmp
         break
     fi
 done
+fi
 
-echo "using $executeJava"
-
-netcardIndex=0
-if [ $# -gt 1 ]; then
-    netcardIndex=$3
+netcardIndex=
+netcardName=
+if [ $# -gt 2 ]; then
+    if [[ $3 =~ ^[0-9]$ ]]; then 
+        netcardIndex=$3
+    else
+        netcardName=$3
+    fi
 fi
-echo $netcardIndex
+
 cd .. 
-export CLASSPATH=$UAVPATH/uav/uavagent/bin/com.creditease.uav.base-1.0-boot.jar 
-APPGROUP=${HOSTNAMEFORGROUP%-*}
-APPGROUP=${APPGROUP%-*}
+export CLASSPATH=$UAVBASE/uav/uavagent/bin/com.creditease.uav.base-1.0-boot.jar 
 echo $CLASSPATH
 
-javaAgent="-javaagent:$UAVPATH/uav/uavmof/com.creditease.uav.agent/com.creditease.uav.monitorframework.agent-1.0-agent.jar"
+javaAgent="-javaagent:$UAVBASE/uav/uavmof/com.creditease.uav.agent/com.creditease.uav.monitorframework.agent-1.0-agent.jar"
 javaOpts="-server -Xms64m -Xmx256m -Xss256k -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:CMSIncrementalDutyCycle=10 -XX:+UseParNewGC -XX:+UseCMSCompactAtFullCollection -XX:-CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=0 -XX:CMSInitiatingOccupancyFraction=70 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=." 
-$executeJava $javaAgent $javaOpts -XX:OnOutOfMemoryError='kill -9 %p' -DNetCardIndex=$netcardIndex -DJAppID=$2 -DJAppGroup=$APPGROUP -classpath $CLASSPATH com.creditease.mscp.boot.MSCPBoot -p $1 &
+$executeJava $javaAgent $javaOpts -XX:OnOutOfMemoryError='kill -9 %p' -DNetCardIndex=$netcardIndex -DNetCardName=$netcardName -DJAppID=$2 -DDeploymentType=container -classpath $CLASSPATH com.creditease.mscp.boot.MSCPBoot -p $1 

com.creditease.uav.agent.buildComponent/bin/start_ma_pro_docker.sh

@@ -1,5 +1,4 @@
 #!/bin/sh 
-UAVPATH=/opt
-JAVA_HOME=/usr/java/jdk1.7.0_71
-cd $UAVPATH/uav/uavagent/bin/ 
-nohup  /bin/sh $UAVPATH/uav/uavagent/bin/run4docker.sh ma_pro MonitorAgent 0 $JAVA_HOME 
+UAVBASE=/app
+cd $UAVBASE/uav/uavagent/bin/ 
+nohup run4docker.sh ma_pro MonitorAgent $1 $2

com.creditease.uav.agent.buildComponent/bin/start_ma_pro_k8s.sh

@@ -1,4 +1,5 @@
 #!/bin/sh 
-UAVPATH=/opt
-cd $UAVPATH/uav/uavagent/bin/ 
-nohup  /bin/sh $UAVPATH/uav/uavagent/bin/run4k8s.sh ma_pro MonitorAgent 0 $JAVA_HOME &
+chmod +x *
+UAVBASE=/app
+cd $UAVBASE/uav/uavagent/bin/
+/bin/sh run4k8s.sh ma_pro MonitorAgent $1 $2

com.creditease.uav.agent.buildComponent/bin/start_ma_test_docker.sh

@@ -1,5 +1,5 @@
 #!/bin/sh 
-UAVPATH=/opt
-JAVA_HOME=/usr/java/jdk1.7.0_71
-cd $UAVPATH/uav/uavagent/bin/ 
-nohup  /bin/sh $UAVPATH/uav/uavagent/bin/run4docker.sh ma_test MonitorAgent 0 $JAVA_HOME
+chmod +x *
+UAVBASE=/app
+cd $UAVBASE/uav/uavagent/bin/ 
+/bin/sh run4docker.sh ma_test MonitorAgent $1 $2

com.creditease.uav.agent.buildComponent/bin/start_ma_test_k8s.sh

@@ -1,4 +1,5 @@
 #!/bin/sh 
-UAVPATH=/opt
-cd $UAVPATH/uav/uavagent/bin/ 
-nohup  /bin/sh $UAVPATH/uav/uavagent/bin/run4k8s.sh ma_test MonitorAgent 0 $JAVA_HOME &
+chmod +x *
+UAVBASE=/app
+cd $UAVBASE/uav/uavagent/bin/ 
+/bin/sh run4k8s.sh ma_test MonitorAgent $1 $2

com.creditease.uav.agent/src/main/java/com/creditease/agent/feature/monitoragent/detect/JVMContainerOSDetector.java

@@ -70,6 +70,13 @@ public void completed(HttpClientCallbackResult result) {
                 return;
             }
 
+            /**
+             * vendor=="Tomcat" or "Jetty" or "JBoss" or "JSE" or "MSCP" or "SpringBoot"; so 3<=vendor.length()<=10
+             */
+            if (!(vendor.length() >= 3 && vendor.length() <= 10)) {
+                return;
+            }
+
             if (log.isTraceEnable()) {
                 log.info(this, "A Container[" + url + "]'s JVM[" + vendor + "] Detected.");
             }
@@ -258,6 +265,17 @@ private void scanWithProcDetection() {
                 continue;
             }
 
+            Map<String, String> tags = proc.getTags();
+
+            String jargs = StringHelper.isEmpty(tags.get("jargs")) ? "" : tags.get("jargs");
+
+            /**
+             * NOTE: must install uavmof
+             */
+            if (!(jargs.contains("-javaagent:") && jargs.contains("monitorframework"))) {
+                continue;
+            }
+
             for (String port : proc.getPorts()) {
                 String baseurl;
 

com.creditease.uav.base/src/main/java/com/creditease/agent/SystemStarter.java

@@ -22,6 +22,7 @@
 
 import java.io.PrintStream;
 import java.lang.reflect.Constructor;
+import java.net.InetAddress;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -191,10 +192,22 @@ private void checkNetworkReady() {
                 log.warn(this, "Waiting for network ready: iteration=" + i + ", current IP=" + ipAddr);
             }
             else {
+
                 log.info(this, "Node IP address=" + ipAddr);
 
                 isReady = true;
 
+                StringBuffer ipmsg = new StringBuffer("List NetCardIndex and IP Address:");
+
+                int index = 0;
+
+                for (InetAddress addr : NetworkHelper.getAllIP()) {
+
+                    ipmsg.append("\n").append(index++).append(" ----- ").append(addr.getHostAddress());
+                }
+
+                log.info(this, ipmsg.toString());
+
                 break;
             }
         }