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

2 files changed, 7 insertions, 0 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()));
 		}