perf: NEZ-2463 编译rpm时打包jdk依赖

.gitlab-ci.yml

@@ -2,7 +2,7 @@
 image: git.mesalab.cn:7443/nezha/nz-build-env:1.3
 # 定义全局变量
 variables:
-  MINIO_HOST: 'http://192.168.41.160:2020/'
+  MINIO_HOST: 'http://192.168.40.48:2020/'
   MINIO_USER: 'admin'
   MINIO_PWD: "Nezha@02!"
   MAVEN_REPO: "/etc/maven/repository/"
@@ -55,8 +55,19 @@ dev_build:
   script:
     - env | sort
     - pwd
+    - export FILE_NAME=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA.tar.gz
+    - export BRANCH_ARRAY=(${CI_COMMIT_REF_NAME//-/ })
+    - echo -e "version=${BRANCH_ARRAY[1]}\ncommit=$CI_COMMIT_SHORT_SHA\nbuildDate=`date +'%Y%m%d%H%m%S'`" >>./src/main/resources/version.properties
     - mvn clean install -Dxjar.password=111111 -Dxjar.excludes=/db/*,/static/**/*
-    - cd ./target && go build xjar.go && cd ..
+    - cd ./target
+    - go build xjar.go
+    - chmod +x xjar
+    - "git log -100 --pretty=format:'%ad : %s' >> git-log.html"
+    - tar -zcvf $FILE_NAME xjar nz-talon.xjar git-log.html
+    - mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD
+    - mc cp $FILE_NAME nz/ci-cd/nz-talon/$FILE_NAME
+    - mc cp $FILE_NAME nz/ci-cd/nz-talon/$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-latest.tar.gz
+    - cd ../
   artifacts:
     name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
     when: on_success

pom.xml

@@ -149,7 +149,7 @@
 		<pluginRepository>
 			<id>nexus</id>
 			<name>Team Nexus Repository</name>
-			<url>http://192.168.40.125:8099/content/groups/public/</url>
+			<url>http://192.168.40.153:8099/content/groups/public/</url>
 		</pluginRepository>
 		<pluginRepository>
 			<id>public</id>

src/main/java/net/geedge/confagent/util/OSHIUtils.java

@@ -163,6 +163,7 @@ public class OSHIUtils {
             procsData.put("path",proc.getPath());
             procsData.put("virtualSize",proc.getVirtualSize());
             procsData.put("residentSetSize",proc.getResidentSetSize());
+            procsData.put("runTime",proc.getUpTime());
             result.add(procsData);
         }
 
@@ -208,11 +209,13 @@ public class OSHIUtils {
             map.put("receiveQueue",connection.getReceiveQueue());
             if (connection.getowningProcessId() == -1 ){
                 //未知进程 getowningProcessId 返回 -1 为避免获取进程name error
-                map.put("processId","unknown");
-                map.put("processName","unknown");
+                map.put("processId",-1);
+                map.put("processName","");
+                map.put("processCmd","");
             }else {
                 map.put("processId",connection.getowningProcessId());
                 map.put("processName",operatingSystem.getProcess(connection.getowningProcessId()).getName());
+                map.put("processCmd",operatingSystem.getProcess(connection.getowningProcessId()).getCommandLine());
             }
 
             result.add(map);

tools/afterinstall.sh

@@ -1,7 +1,11 @@
 #!/bin/sh
 
+WORK_DIR=/opt/nezha/nz-talon
+
 # Find Java
-if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
+if [[ -x "$WORK_DIR/jdk/bin/java" ]]; then
+    JAVA_EXE="$WORK_DIR/jdk/bin/java"
+elif [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
     JAVA_EXE="$JAVA_HOME/bin/java"
 elif type -p java > /dev/null 2>&1; then
     JAVA_EXE=$(type -p java)

tools/package.sh

@@ -11,6 +11,8 @@ if [[ "${BRANCH_ARRAY[0]}" == "rel" ]] ; then
 fi
 RPM_FULL_NAME=${PACKAGE_NAME}-${PACKAGE_VERSION}-${ITERATION}.x86_64.rpm
 
+# 依赖jdk 文件名
+JDK_FILENAME=jdk-8u202-linux-x64.tar.gz
 
 # 初始化 minio
 mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD
@@ -19,9 +21,11 @@ mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD
 BUILD_PATH=$CUR_PWD/build
 RPM_TALON_PATH=$BUILD_PATH/opt/nezha/nz-talon
 RPM_PROMTAIL_PATH=$BUILD_PATH/opt/nezha/promtail
+RPM_JDK_PATH=$RPM_TALON_PATH/jdk
 
 mkdir -p $RPM_TALON_PATH $RPM_PROMTAIL_PATH
 mkdir -p $RPM_TALON_PATH/config
+mkdir -p $RPM_JDK_PATH
 
 echo 'packaging nz-talon ...'
 #添加版本信息
@@ -41,6 +45,10 @@ cp -f ./target/xjar $RPM_TALON_PATH
 cp -f ./src/main/resources/{application-prod.yml,application.yml,logback-spring.xml,config/auth.yml,config/token.auth,config/promtail.version} ${RPM_TALON_PATH}/config
 sed -i 's/<property name="log.path" value=".*"/<property name="log.path" value="\/var\/log\/nezha\/nz-talon\/"/g' ${RPM_TALON_PATH}/config/logback-spring.xml
 
+# 准备 jdk 编译目录
+mc cp nz/depends/jdk/$JDK_FILENAME ./
+tar -xzf ./$JDK_FILENAME --strip-components 1 -C $RPM_JDK_PATH
+
 # 下载 promtail
 mc cp nz/depends/loki/promtail-linux-amd64.zip ./
 unzip  -o promtail-linux-amd64.zip -d $RPM_PROMTAIL_PATH