容器指标

jjt-biz/src/main/java/com/jjt/biz/service/impl/BizObjMetricsServiceImpl.java

@@ -254,6 +254,10 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
                 } else {
                     //如果是普罗米修斯，则需要处理公式
                     ms.setDataExp(d.getDataExp().replace("${instance}", obj.getObjAddr()));
+                    if ("3".equals(d.getMetricsDef().getMetricsType())) {
+                        //如果是容器指标，则需要替换为=~ "xxxx.*" 模式
+                        ms.setDataExp(d.getDataExp().replace("${instance}", obj.getObjAddr() + ".*"));
+                    }
                     if ("Y".equals(d.getFindFlag())) {
                         //如果是自动发现
                         cn.hutool.json.JSONObject jsonObject = prometheusService.find(d.getFindRule());

jjt-biz/src/main/resources/mapper/obj/BizObjMetricsMapper.xml

@@ -118,7 +118,7 @@
                 and UPDATE_TIME = #{updateTime}
             </if>
             <if test="params.type != null and params.type != ''">
-                and METRICS_TYPE = #{params.type}
+                and METRICS_TYPE != '1'
             </if>
             <if test="remark != null  and remark != ''">
                 and REMARK = #{remark}