From 437256afe27bcd5552f81ed71f69c73d19f8231c Mon Sep 17 00:00:00 2001
From: chenli <013250622062>
Date: Fri, 19 Mar 2021 16:20:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9prometheus=E7=9B=91=E6=8E=A7b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel-o-monitor/monitor-integration-beetl/pom.xml         | 2 +-
 .../controller/PrometheusMonitorController.java            | 4 +---
 .../pages/modular/system/monitor/logbackInfo.html          | 3 ++-
 kernel-o-monitor/monitor-spring-boot-starter/pom.xml       | 7 +++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/kernel-o-monitor/monitor-integration-beetl/pom.xml b/kernel-o-monitor/monitor-integration-beetl/pom.xml
index 9674b9a86..da01f1c41 100644
--- a/kernel-o-monitor/monitor-integration-beetl/pom.xml
+++ b/kernel-o-monitor/monitor-integration-beetl/pom.xml
@@ -20,7 +20,7 @@
         <!--监控的自动配置-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>monitor-spring-boot-starter</artifactId>
+            <artifactId>monitor-sdk-prometheus</artifactId>
             <version>7.0.1</version>
         </dependency>
 
diff --git a/kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/PrometheusMonitorController.java b/kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/PrometheusMonitorController.java
index fdbaeeec0..c3c2cd68c 100644
--- a/kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/PrometheusMonitorController.java
+++ b/kernel-o-monitor/monitor-integration-beetl/src/main/java/cn/stylefeng/roses/kernel/monitor/integration/controller/PrometheusMonitorController.java
@@ -4,14 +4,12 @@ import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.monitor.api.PrometheusApi;
 import cn.stylefeng.roses.kernel.monitor.api.constants.MonitorConstants;
 import cn.stylefeng.roses.kernel.monitor.api.pojo.prometheus.PromResultInfo;
-import cn.stylefeng.roses.kernel.monitor.system.holder.SystemHardwareInfoHolder;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -86,7 +84,7 @@ public class PrometheusMonitorController {
      */
     @GetResource(name = "jvm监控数据", path = "/view/monitor/getJvmInfo")
     @ResponseBody
-    public String jvmInfo(@RequestParam("id") String id, @RequestParam("area") String area) {
+    public String jvmInfo(@RequestParam(value = "id",required = false) String id, @RequestParam(value = "area",required = false) String area) {
         Map<String, Object> metricMap = getMetricInfos(getPromQl(id, area), "jvm_", "", "");
         return JSON.toJSONString(metricMap);
     }
diff --git a/kernel-o-monitor/monitor-integration-beetl/src/main/resources/pages/modular/system/monitor/logbackInfo.html b/kernel-o-monitor/monitor-integration-beetl/src/main/resources/pages/modular/system/monitor/logbackInfo.html
index f1904efe5..209a3dd29 100644
--- a/kernel-o-monitor/monitor-integration-beetl/src/main/resources/pages/modular/system/monitor/logbackInfo.html
+++ b/kernel-o-monitor/monitor-integration-beetl/src/main/resources/pages/modular/system/monitor/logbackInfo.html
@@ -83,7 +83,8 @@
             request.dataObject = {
                 level: level,
                 isRate: 'irate',
-                rateMetric: 'logback_events_total'
+                rateMetric: 'logback_events_total',
+                timeInterval: '[5m]'
             };
             request.setAsync(true);
             request.start();
diff --git a/kernel-o-monitor/monitor-spring-boot-starter/pom.xml b/kernel-o-monitor/monitor-spring-boot-starter/pom.xml
index 5f5737d2b..143001a9d 100644
--- a/kernel-o-monitor/monitor-spring-boot-starter/pom.xml
+++ b/kernel-o-monitor/monitor-spring-boot-starter/pom.xml
@@ -31,6 +31,13 @@
             <version>7.0.1</version>
         </dependency>
 
+        <!--prometheus融合模块-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>monitor-integration-beetl</artifactId>
+            <version>7.0.1</version>
+        </dependency>
+
     </dependencies>
 
 </project>