From 1606dcd85bd7357e70103c332694aec8d28fec91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Thu, 24 Nov 2022 23:26:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90spring-boot-admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 maku-boot-module/maku-module-monitor/pom.xml       | 35 ++++++++++++++++++++++
 .../monitor/config/AdminServerConfiguration.java   | 10 +++++++
 .../src/main/resources/auth.yml                    |  3 ++
 maku-server/src/main/resources/application-dev.yml | 25 +++++++++++++++-
 .../src/main/resources/application-prod.yml        | 25 +++++++++++++++-
 .../src/main/resources/application-test.yml        | 25 +++++++++++++++-
 6 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 maku-boot-module/maku-module-monitor/pom.xml
 create mode 100644 maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/config/AdminServerConfiguration.java
 create mode 100644 maku-boot-module/maku-module-monitor/src/main/resources/auth.yml

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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>net.maku</groupId>
+        <artifactId>maku-boot-module</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>maku-module-monitor</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.maku</groupId>
+            <artifactId>maku-framework</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-server</artifactId>
+            <version>2.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>2.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-core</artifactId>
+            <version>6.3.2</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ 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