diff --git a/maku-boot-module/maku-module-monitor/pom.xml b/maku-boot-module/maku-module-monitor/pom.xml new file mode 100644 index 0000000..e0648cd --- /dev/null +++ b/maku-boot-module/maku-module-monitor/pom.xml @@ -0,0 +1,35 @@ + + + net.maku + maku-boot-module + ${revision} + + 4.0.0 + maku-module-monitor + jar + + + + net.maku + maku-framework + ${revision} + + + de.codecentric + spring-boot-admin-starter-server + 2.7.7 + + + de.codecentric + spring-boot-admin-starter-client + 2.7.7 + + + com.github.oshi + oshi-core + 6.3.2 + + + + \ No newline at end of file diff --git a/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/config/AdminServerConfiguration.java b/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/config/AdminServerConfiguration.java new file mode 100644 index 0000000..0656051 --- /dev/null +++ b/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/config/AdminServerConfiguration.java @@ -0,0 +1,10 @@ +package net.maku.monitor.config; + +import de.codecentric.boot.admin.server.config.EnableAdminServer; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@EnableAdminServer +public class AdminServerConfiguration { + +} diff --git a/maku-boot-module/maku-module-monitor/src/main/resources/auth.yml b/maku-boot-module/maku-module-monitor/src/main/resources/auth.yml new file mode 100644 index 0000000..ef5984c --- /dev/null +++ b/maku-boot-module/maku-module-monitor/src/main/resources/auth.yml @@ -0,0 +1,3 @@ +auth: + ignore_urls: + - /monitor/admin/** \ No newline at end of file diff --git a/maku-server/src/main/resources/application-dev.yml b/maku-server/src/main/resources/application-dev.yml index 36432cc..34f9ed6 100644 --- a/maku-server/src/main/resources/application-dev.yml +++ b/maku-server/src/main/resources/application-dev.yml @@ -29,4 +29,27 @@ spring: idle-timeout: 600000 # 连接超时的最大时长(毫秒),超时则被释放(retired),默认:10 分钟 max-lifetime: 1800000 # 连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认: 30 分钟 connection-test-query: SELECT 1 - pool-name: MakuHikariCP \ No newline at end of file + pool-name: MakuHikariCP + + +--- ############ 监控相关配置 + +# Actuator 配置 +management: + endpoints: + web: + base-path: /actuator + exposure: + include: '*' + +# Spring Boot Admin 配置 +spring: + boot: + admin: + # Spring Boot Admin Server 服务端地址 + context-path: /monitor/admin + client: + # 指定 Spring Boot Admin Server 服务端地址 + url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} + instance: + service-host-type: IP \ No newline at end of file diff --git a/maku-server/src/main/resources/application-prod.yml b/maku-server/src/main/resources/application-prod.yml index 64b48bc..c00545a 100644 --- a/maku-server/src/main/resources/application-prod.yml +++ b/maku-server/src/main/resources/application-prod.yml @@ -19,4 +19,27 @@ spring: idle-timeout: 600000 # 连接超时的最大时长(毫秒),超时则被释放(retired),默认:10 分钟 max-lifetime: 1800000 # 连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认: 30 分钟 connection-test-query: SELECT 1 - pool-name: MakuHikariCP \ No newline at end of file + pool-name: MakuHikariCP + + +--- ############ 监控相关配置 + +# Actuator 配置 +management: + endpoints: + web: + base-path: /actuator + exposure: + include: '*' + +# Spring Boot Admin 配置 +spring: + boot: + admin: + # Spring Boot Admin Server 服务端地址 + context-path: /monitor/admin + client: + # 指定 Spring Boot Admin Server 服务端地址 + url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} + instance: + service-host-type: IP \ No newline at end of file diff --git a/maku-server/src/main/resources/application-test.yml b/maku-server/src/main/resources/application-test.yml index 64b48bc..c00545a 100644 --- a/maku-server/src/main/resources/application-test.yml +++ b/maku-server/src/main/resources/application-test.yml @@ -19,4 +19,27 @@ spring: idle-timeout: 600000 # 连接超时的最大时长(毫秒),超时则被释放(retired),默认:10 分钟 max-lifetime: 1800000 # 连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认: 30 分钟 connection-test-query: SELECT 1 - pool-name: MakuHikariCP \ No newline at end of file + pool-name: MakuHikariCP + + +--- ############ 监控相关配置 + +# Actuator 配置 +management: + endpoints: + web: + base-path: /actuator + exposure: + include: '*' + +# Spring Boot Admin 配置 +spring: + boot: + admin: + # Spring Boot Admin Server 服务端地址 + context-path: /monitor/admin + client: + # 指定 Spring Boot Admin Server 服务端地址 + url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} + instance: + service-host-type: IP \ No newline at end of file