diff --git a/pom.xml b/pom.xml index 96e854c5..e6efdc28 100644 --- a/pom.xml +++ b/pom.xml @@ -192,10 +192,6 @@ org.projectlombok lombok - - org.springframework.boot - spring-boot-autoconfigure - diff --git a/src/main/java/cn/stylefeng/guns/config/web/PrometheusConfiguration.java b/src/main/java/cn/stylefeng/guns/config/web/PrometheusConfiguration.java deleted file mode 100644 index 05a17967..00000000 --- a/src/main/java/cn/stylefeng/guns/config/web/PrometheusConfiguration.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.stylefeng.guns.config.web; - -import cn.stylefeng.roses.kernel.monitor.api.PrometheusApi; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.annotation.Resource; - -/** - * 是否显示prometheus菜单 - * - * @author chenli - * @date 2021/3/3 17:14 - */ -@Configuration -@Slf4j -public class PrometheusConfiguration { - - @Value("${prometheus.enabled}") - private boolean prometheusEnabled; - - @Resource - private PrometheusApi prometheusApi; - - /*** - * 配置是否开启prometheus相关菜单 - * - * @author chenli - * @date 2021/3/3 17:14 - */ - @Bean - public void configPrometheusMenu(){ - if(prometheusEnabled){ - prometheusApi.displayPrometheusMenu(); - } else { - prometheusApi.closePrometheusMenu(); - } - } - -} diff --git a/src/main/java/cn/stylefeng/guns/modular/system/monitor/MonitorController.java b/src/main/java/cn/stylefeng/guns/modular/system/monitor/MonitorController.java index be71d680..7cd7de8b 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/monitor/MonitorController.java +++ b/src/main/java/cn/stylefeng/guns/modular/system/monitor/MonitorController.java @@ -1,26 +1,12 @@ package cn.stylefeng.guns.modular.system.monitor; -import cn.hutool.core.util.StrUtil; -import cn.stylefeng.guns.core.consts.ProjectConstants; -import cn.stylefeng.roses.kernel.monitor.api.PrometheusApi; -import cn.stylefeng.roses.kernel.monitor.api.pojo.prometheus.PromResultInfo; -import cn.stylefeng.roses.kernel.monitor.prometheus.service.PrometheusService; 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.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; /** * 项目监控 @@ -35,21 +21,6 @@ public class MonitorController { @Resource private SystemHardwareInfoHolder systemHardwareInfoHolder; - @Value("${server.port}") - private String port; - - @Value("${spring.application.name}") - private String name; - - @Value("${prometheus.url}") - private String prometheusUrl; - - @Value("${prometheus.instance}") - private String prometheusInstance; - - @Resource - private PrometheusApi service; - /** * 系统硬件信息页面 * @@ -73,228 +44,4 @@ public class MonitorController { return "/modular/system/monitor/druid.html"; } - /** - * tomcat监控页面 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - @GetResource(name = "tomcat监控首页", path = "/view/monitor/tomcatInfo") - public String tomcatIndex() { - return "/modular/system/monitor/tomcatInfo.html"; - } - - /** - * tomcat监控数据 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - @GetResource(name = "tomcat监控数据", path = "/view/monitor/getTomcatInfo") - @ResponseBody - public String tomcatInfo() { - Map metricMap = getMetricInfos(getPromQl(),"tomcat_","",""); - return JSON.toJSONString(metricMap); - } - /** - * jvm监控页面 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - @GetResource(name = "jvm监控页面", path = "/view/monitor/jvmInfo") - public String jvmIndex() { - return "/modular/system/monitor/jvmInfo.html"; - } - - /** - * jvm监控数据 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - @GetResource(name = "jvm监控数据", path = "/view/monitor/getJvmInfo") - @ResponseBody - public String jvmInfo(@Param("id") String id, @Param("area") String area) { - Map metricMap = getMetricInfos(getPromQl(id,area),"jvm_","",""); - return JSON.toJSONString(metricMap); - } - - /** - * 性能监控页面 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - @GetResource(name = "性能监控页面", path = "/view/monitor/performanceInfo") - public String performanceIndex() { - return "/modular/system/monitor/performanceInfo.html"; - } - - /** - * 性能监控数据 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - @GetResource(name = "CPU监控数据", path = "/view/monitor/getCpuInfo") - @ResponseBody - public String cpuInfo() { - Map metricMap = getMetricInfos(getPromQl(),"cpu_","",""); - return JSON.toJSONString(metricMap); - } - - /** - * 服务器负载监控数据 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - @GetResource(name = "服务器负载监控数据", path = "/view/monitor/getLoadInfo") - @ResponseBody - public String loadInfo() { - Map metricMap = getMetricInfos(getPromQl(),"system_","",""); - return JSON.toJSONString(metricMap); - } - - /** - * 进程监控数据 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - @GetResource(name = "进程监控数据", path = "/view/monitor/getProcessInfo") - @ResponseBody - public String processInfo() { - Map metricMap = getMetricInfos(getPromQl(),"process_","",""); - return JSON.toJSONString(metricMap); - } - - /** - * 日志监控页面 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - @GetResource(name = "日志监控页面", path = "/view/monitor/logbackInfo") - public String logbackIndex() { - return "/modular/system/monitor/logbackInfo.html"; - } - - /** - * 日志监控数据 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - @GetResource(name = "日志监控数据", path = "/view/monitor/getLogbackInfo") - @ResponseBody - public String logbackInfo(@Param("level") String level, @Param("timeInterval") String timeInterval, @Param("isRate") String isRate, @Param("rateMetric") String rateMetric) { - if(StrUtil.isEmpty(timeInterval)){ - timeInterval = "[5m]"; - } - Map metricMap = getMetricInfos(getIratePromQl(level, timeInterval),"logback_",isRate,rateMetric); - return JSON.toJSONString(metricMap); - } - - /** - * 组装prometheus查询sql - * - * @param id 同一指标不同分类的id号 - * @param area 查询区域jvm常用 - * @author chenli - * @date 2021/1/4 16:32 - */ - private String getPromQl(String id,String area){ - StringBuilder promql = new StringBuilder("{application=\""); - promql.append(name); - if(!StrUtil.isEmpty(id)){ - promql.append("\",id=\""); - promql.append(id); - } - if(!StrUtil.isEmpty(area)){ - promql.append("\",area=\""); - promql.append(area); - } - if(!StrUtil.isEmpty(prometheusInstance)){ - promql.append("\",instance=\""); - promql.append(prometheusInstance); - } - promql.append("\"}"); - return promql.toString(); - } - - /** - * 组装prometheus查询sql方法重写不带参数 - * - * @author chenli - * @date 2021/1/4 16:32 - */ - private String getPromQl(){ - StringBuilder promql = new StringBuilder("{application=\""); - promql.append(name); - if(!StrUtil.isEmpty(prometheusInstance)){ - promql.append("\",instance=\""); - promql.append(prometheusInstance); - } - promql.append("\"}"); - return promql.toString(); - } - - /** - * 组装prometheus平均值查询sql方法重写不带参数 - * - * @param level 日志统计查询参数，info、warn、error、trace、debug - * @param timeInterval 统计时间区间单位通常为分钟(m) - * @author chenli - * @date 2021/1/4 16:32 - */ - private String getIratePromQl(String level,String timeInterval){ - StringBuilder promql = new StringBuilder("{application=\""); - promql.append(name); - if(!StrUtil.isEmpty(prometheusInstance)){ - promql.append("\",instance=\""); - promql.append(prometheusInstance); - } - if(!StrUtil.isEmpty(level)){ - promql.append("\",level=\""); - promql.append(level); - } - promql.append("\"}"); - promql.append(timeInterval); - return promql.toString(); - } - - /** - * 分别输出监控名称以及对应的值 - * - * @param promQL prometheus查询sql - * @param metric prometheus指标前缀，比如："jvm_" - * @param isRate prometheus计算函数，不需要计算周期内值就直接为"",需要计算则写计算函数以及对应的指标 - * @author chenli - * @date 2021/1/4 16:32 - */ - private Map getMetricInfos(String promQL, String metric,String isRate, String rateMetric) { - Map metricMap = new HashMap<>(); - if (!StrUtil.isEmpty(prometheusUrl)) { - List promResultInfos = service.getMetricInfo(prometheusUrl.concat(ProjectConstants.PROMETHEUS_QUERY_RANGE), promQL,isRate,rateMetric); - if(Objects.isNull(promResultInfos)){ - return metricMap; - } - for (PromResultInfo promResultInfo : promResultInfos) { - String metricName = promResultInfo.getMetric().get__name__(); - JSONArray valueArray = JSONArray.parseArray(JSON.toJSONString(promResultInfo.getValues()).replaceAll("\\\\","").replace("\"", "")); - if (!StrUtil.isEmpty(metricName)) { - if (metricName.contains(metric)) { - // 得到的数据为数组，需要转为json字符串去除双引号再转化为JSONArray，JSONArray是echarts时间序列图需要的数据格式 - metricMap.put(metricName, valueArray); - } - } else { - // 查询指定的指标 - metricMap.put(rateMetric,valueArray); - } - } - } - return metricMap; - } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e493fc8c..32c07c98 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -53,23 +53,3 @@ mybatis-plus: # 是否开启websocket推送消息 web-socket: open: true - -# prometheus监控 -management: - endpoints: - web: - exposure: - include: "*" - metrics: - tags: - application: ${spring.application.name} - export: - prometheus: - enabled: true - jmx: - enabled: true -prometheus: - enabled: false - url: http://localhost:9090/api/v1/ - # 非必须配置项 - instance: \ No newline at end of file