From 2657c2e9fbf1ad1a212ecb45b7053e77854083e4 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 6 Mar 2021 10:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.1=E3=80=91=E3=80=90monitor?=
 =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E6=8E=A7=E5=88=B6=E5=99=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ....java => PrometheusMonitorController.java} | 32 ++-----------------
 1 file changed, 3 insertions(+), 29 deletions(-)
 rename kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/{MonitorController.java => PrometheusMonitorController.java} (91%)

diff --git a/kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/MonitorController.java b/kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/PrometheusMonitorController.java
similarity index 91%
rename from kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/MonitorController.java
rename to kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/PrometheusMonitorController.java
index 87784bab7..fdbaeeec0 100644
--- a/kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/MonitorController.java
+++ b/kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/PrometheusMonitorController.java
@@ -22,17 +22,14 @@ import java.util.Map;
 import java.util.Objects;
 
 /**
- * 项目监控
+ * 来自prometheus的监控
  *
  * @author chenli
  * @date 2020/12/30 16:40
  */
 @Controller
-@ApiResource(name = "项目监控")
-public class MonitorController {
-
-    @Resource
-    private SystemHardwareInfoHolder systemHardwareInfoHolder;
+@ApiResource(name = "来自prometheus的监控")
+public class PrometheusMonitorController {
 
     @Value("${spring.application.name}")
     private String name;
@@ -46,29 +43,6 @@ public class MonitorController {
     @Resource
     private PrometheusApi service;
 
-    /**
-     * 系统硬件信息页面
-     *
-     * @author fengshuonan
-     * @date 2018/12/24 22:43
-     */
-    @GetResource(name = "服务器监控", path = "/view/monitor/systemInfo")
-    public String systemInfo(Model model) {
-        model.addAttribute("server", systemHardwareInfoHolder.getSystemHardwareInfo());
-        return "/modular/system/monitor/systemInfo.html";
-    }
-
-    /**
-     * druid sql监控页面
-     *
-     * @author chenli
-     * @date 2021/1/4 16:32
-     */
-    @GetResource(name = "SQL监控", path = "/view/monitor/druid")
-    public String druidInfo() {
-        return "/modular/system/monitor/druid.html";
-    }
-
     /**
      * tomcat监控页面
      *