fix: 解决不能还原 telegraf.d 中新增配置文件问题

.gitlab-ci.yml

@@ -64,9 +64,11 @@ dev_build:
     - chmod +x xjar
     - "git log -100 --pretty=format:'%ad : %s' >> git-log.html"
     - tar -zcvf $FILE_NAME xjar nz-talon.xjar git-log.html
+    - md5sum $FILE_NAME > $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-latest.tar.gz.md5sum.txt
     - 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
+    - mc cp $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-latest.tar.gz.md5sum.txt nz/ci-cd/nz-talon/$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-latest.tar.gz.md5sum.txt
     - cd ../
   artifacts:
     name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"

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

@@ -100,7 +100,7 @@ public class OSHIUtils {
         }
 
         List<HashMap<Object, Object>> network = Tool.ListUtil.list(false);
-        List<NetworkIF> networkIFs = hal.getNetworkIFs();
+        List<NetworkIF> networkIFs = hal.getNetworkIFs(true);
         for (NetworkIF networkIF : networkIFs) {
             HashMap<Object, Object> networkData = Tool.MapUtil.newHashMap();
             networkData.put("index", networkIF.getIndex());

tools/afterinstall.sh

@@ -80,10 +80,8 @@ restoreComponentConfig(){
 
   for i in $(ls $2);do
     if [ 1 -eq `compareMD5 $1/$i $2/$i` ];then
-      if [ -f $1/${i} ];then
-          echo 'return config file '$1/${i}
-          cp -f $2/$i $1/$i
-      fi
+        echo 'return config file '$1/${i}
+        cp -f $2/$i $1/$i
     fi
   done
 }
@@ -112,6 +110,7 @@ Description=nz-talon
 After=network.target
 [Service]
 WorkingDirectory=/opt/nezha/nz-talon
+EnvironmentFile=-/opt/nezha/nz-talon/config/config.conf
 ExecStart=/opt/nezha/nz-talon/xjar ${JAVA_EXE} --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/jdk.internal.loader=ALL-UNNAMED -Dnz-agent.dir=/opt/nezha/nz-talon -jar /opt/nezha/nz-talon/nz-talon.xjar
 RestartSec=5s
 Restart=always