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 @@
cn.stylefeng.roses
- monitor-spring-boot-starter
+ monitor-sdk-prometheus
7.0.1
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 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 @@
7.0.1
+
+
+ cn.stylefeng.roses
+ monitor-integration-beetl
+ 7.0.1
+
+