Skip to content

Commit

Permalink
Merge pull request #3 from uavorg/master
Browse files Browse the repository at this point in the history
update
  • Loading branch information
lbay2015 authored Dec 15, 2017
2 parents ba99859 + 8101826 commit e469e6a
Show file tree
Hide file tree
Showing 40 changed files with 3,511 additions and 1,428 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ uavstack is the All in One source repository of UAVStack.
* 服务授权(代码整理中,陆续更新...)

# 如何构建 How to Build
如果由于缺少jar包或某些依赖jar无法下载导致Maven Build Failure,可下载[参考Maven依赖仓库](http://pan.baidu.com/s/1i5veR33),使用该Maven仓库或将其复制到你正在使用的Maven仓库中。
如果由于缺少jar包或某些依赖jar无法下载导致Maven Build Failure,可下载[参考Maven依赖仓库](https://pan.baidu.com/s/1gfeY8pH),使用该Maven仓库或将其复制到你正在使用的Maven仓库中。

If you are unable to build because of the lack of jar packages or certain dependency jar, pleaser refer this [Maven Repository](http://pan.baidu.com/s/1i5veR33), use the Maven repository, or copy it to the Maven warehouse you are using.
If you are unable to build because of the lack of jar packages or certain dependency jar, pleaser refer this [Maven Repository](https://pan.baidu.com/s/1gfeY8pH), use the Maven repository, or copy it to the Maven warehouse you are using.

1. build com.creditease.uav.superpom
```
Expand Down Expand Up @@ -150,23 +150,23 @@ build结果

# 下载中心 Downloads
## 全维监控UAV.Monitor+APM
* [MOF探针](http://pan.baidu.com/s/1c1P0rni)
* [监控代理程序](http://pan.baidu.com/s/1cD9tuu)
* [健康管理服务](http://pan.baidu.com/s/1eROaqEA)
* [AppHub](http://pan.baidu.com/s/1dEBlhwX)
* [MOF探针](https://pan.baidu.com/s/1cg4J0q)
* [监控代理程序](https://pan.baidu.com/s/1ge5MJ9h)
* [健康管理服务](https://pan.baidu.com/s/1i4HnV85)
* [AppHub](https://pan.baidu.com/s/1dFxtDZV)

## 第三方下载 Thirdparty Downloads
* [rocket.war](http://pan.baidu.com/s/1pKCmJ3P)
* [rocket.war](https://pan.baidu.com/s/1dF6NeHN)

## AllInOne开发演示版 AllInOne Install Downloads
开发演示版的健康管理服务(HM)仅适合开发环境,演示环境,小规模测试环境。
生产环境推荐使用[分布式部署](https://uavorg.github.io/main/uavdoc_deploydocs/healmanagerInstall/healmanagerInstall/microservice.html)

The health management service (HM) in AllInOne Install Package is only suitable for development environments, demos, and small scale testing environments. [A distributed deployment](https://uavorg.github.io/main/uavdoc_deploydocs/healmanagerInstall/healmanagerInstall/microservice.html) is recommended for the production environment

* [Windows64位](http://pan.baidu.com/s/1boA9p75)
* [Mac](http://pan.baidu.com/s/1boOMZ2f)
* [Linux(CentOS)](http://pan.baidu.com/s/1qYSG5QW)
* [Windows64位](https://pan.baidu.com/s/1jIF0wNs)
* [Mac](https://pan.baidu.com/s/1mhCykp6)
* [Linux(CentOS)](https://pan.baidu.com/s/1nvj6jW1)



Expand Down
12 changes: 7 additions & 5 deletions com.creditease.uav.agent.buildComponent/bin/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
#NOT READY,PLEASE REFINE THIS

working_directory=$(pwd)
Expand All @@ -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"
Expand All @@ -27,6 +28,7 @@ do
break
fi
done
fi

echo "using $executeJava"

Expand Down
38 changes: 23 additions & 15 deletions com.creditease.uav.agent.buildComponent/bin/run4docker.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
#!/bin/bash
#NOT READY,PLEASE REFINE THIS

UAVPATH=/opt
UAVBASE=/app
HOSTNAME=`hostname`

working_directory=$(pwd)
Expand All @@ -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"
Expand All @@ -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
41 changes: 22 additions & 19 deletions com.creditease.uav.agent.buildComponent/bin/run4k8s.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
2 changes: 1 addition & 1 deletion com.creditease.uav.agent.buildComponent/bin/start.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ if not exist C:\Windows\System32\drivers\npf.sys (move lib\npf.sys C:\Windows\Sy
set CLASSPATH=bin/com.creditease.uav.base-1.0-boot.jar
set javaAgent="-javaagent:../uavmof/com.creditease.uav.agent/com.creditease.uav.monitorframework.agent-1.0-agent.jar"
set javaOpts=-server -Xms64m -Xmx256m -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:CMSIncrementalDutyCycle=10 -XX:+UseParNewGC
java %javaAgent% %javaOpts% -Djava.library.path=./lib -DNetCardIndex=0 -DJAppID=%appID% -DJAppGroup=UAV -classpath "%CLASSPATH%" com.creditease.mscp.boot.MSCPBoot -p %profile%
%executeJava% %javaAgent% %javaOpts% -Djava.library.path=./lib -DNetCardIndex=0 -DJAppID=%appID% -DJAppGroup=UAV -classpath "%CLASSPATH%" com.creditease.mscp.boot.MSCPBoot -p %profile%
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}
Expand Down Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down
Loading

0 comments on commit e469e6a

Please sign in to comment.