feat: NEZ-2013 健康检查接口 增加 version

3 files changed, 14 insertions, 1 deletions

diff --git a/src/main/java/net/geedge/confagent/ConfagentApplication.java b/src/main/java/net/geedge/confagent/ConfagentApplication.java
index 1ad2e04..59d1b14 100644
--- a/src/main/java/net/geedge/confagent/ConfagentApplication.java
+++ b/src/main/java/net/geedge/confagent/ConfagentApplication.java
@@ -8,9 +8,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import cn.hutool.extra.spring.EnableSpringUtil;
 import cn.hutool.log.Log;
 import net.geedge.confagent.util.Tool;
+import org.springframework.context.annotation.PropertySource;
 
 @EnableSpringUtil
 @SpringBootApplication
+@PropertySource(value = { "classpath:version.properties" }, encoding = "utf-8", ignoreResourceNotFound = true)
 public class ConfagentApplication {
 
 	private final static Log log = Log.get();
diff --git a/src/main/java/net/geedge/confagent/controller/HealthyController.java b/src/main/java/net/geedge/confagent/controller/HealthyController.java
index 39118e4..3e043ae 100644
--- a/src/main/java/net/geedge/confagent/controller/HealthyController.java
+++ b/src/main/java/net/geedge/confagent/controller/HealthyController.java
@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -27,6 +28,9 @@ import net.geedge.confagent.util.Tool;
 @RequestMapping("healthy")
 public class HealthyController extends BaseController {
 
+	@Value("${version}")
+	private String version;
+
 	@Autowired
 	private ConfagentUtil confagentUtil;
 	private final static Log log = Log.get();
@@ -78,6 +82,7 @@ public class HealthyController extends BaseController {
 		result.put("snmp_exporter", checkState(snmpExporterHealthy.toString()));
 		result.put("blackbox_exporter", checkState(blackboxExporterHealthy.toString()));
 		result.put("ts",new Date().getTime());
+		result.put("version",version);
 		if (cortexHealthy != null) {
 			result.put("cortex", checkState(cortexHealthy.toString()));
 		}
diff --git a/tools/package.sh b/tools/package.sh
index 6dd68e2..b6df3fa 100644
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -35,7 +35,13 @@ mkdir -p $RPM_AGENT_PATH $RPM_PROMETHEUS_PATH $RPM_CORTEX_PATH $RPM_LOKI_PATH $R
 mkdir -p $RPM_AGENT_PATH/config
 
 echo 'packaging  begin ...'
-# mvn 编译 
+# mvn 编译
+# 准备版本信息文件
+cat >./src/main/resources/version.properties<<EOF
+version=${PACKAGE_VERSION}
+commit=$CI_COMMIT_SHORT_SHA
+buildDate=`date +'%Y%m%d%H%m%S'`
+EOF
 mvn clean install -Dxjar.password=2q667Gykpr36Thcjf4JK -Dxjar.excludes=/db/*,/static/**/*
 cd ./target && go build xjar.go 
 cd $CUR_PWD