diff options
| author | tanghao <default@DESKTOP-7FEGRP2> | 2020-10-16 19:12:53 +0800 |
|---|---|---|
| committer | tanghao <default@DESKTOP-7FEGRP2> | 2020-10-16 19:12:53 +0800 |
| commit | 3f90c278645922eb528baedbbdc469f2903223b7 (patch) | |
| tree | e3d1678232f9d2ce3548702628718711a4a8d399 | |
| parent | cdab979b13182d6ccb90d827443af101b63eec11 (diff) | |
feat: 新增开关控制是否保留instance标签
| -rw-r--r-- | src/main/java/com/nis/job/ConfagentJob.java | 29 | ||||
| -rw-r--r-- | src/main/resources/application.yml | 1 |
2 files changed, 20 insertions, 10 deletions
diff --git a/src/main/java/com/nis/job/ConfagentJob.java b/src/main/java/com/nis/job/ConfagentJob.java index 7e3b6ab..cf0a13d 100644 --- a/src/main/java/com/nis/job/ConfagentJob.java +++ b/src/main/java/com/nis/job/ConfagentJob.java @@ -69,6 +69,9 @@ public class ConfagentJob extends QuartzJobBean { private String promServerPort; + @Value("${confagent.instanceLabel}") + private String instanceLabel; + @Autowired private RedisTemplate<Object,Object> redisTemplate; @@ -319,21 +322,27 @@ public class ConfagentJob extends QuartzJobBean { Map job5=new HashMap(); job5.put("regex", "job"); job5.put("action", "labeldrop"); - Map job6=new HashMap(); - job6.put("regex", "instance"); - job6.put("action", "labeldrop"); + // 控制开关 是否保留instance标签 + if(instanceLabel.equals("0")) { + Map job6=new HashMap(); + job6.put("regex", "instance"); + job6.put("action", "labeldrop"); + list3.add(job6); + } list3.add(job4); list3.add(job5); - list3.add(job6); job.put("relabel_configs", list3); // 配置metric_relabel_config - List list4 =new ArrayList(); - Map job7 =new HashMap(); - job7.put("regex", "instance"); - job7.put("action", "labeldrop"); - list4.add(job7); - job.put("metric_relabel_configs", list4); + // 控制开关 是否保留instance标签 + if(instanceLabel.equals("0")) { + List list4 =new ArrayList(); + Map job7 =new HashMap(); + job7.put("regex", "instance"); + job7.put("action", "labeldrop"); + list4.add(job7); + job.put("metric_relabel_configs", list4); + } if(StringUtils.isNotBlank(type)&&type.equals(ModuleTypeEnum.HTTP.getValue())) { //处理endpoint中param字段json串 请求参数 String param = endpointInfos.get(m).getParam(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fe0eaba..3f21df9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -29,6 +29,7 @@ spring: confagent: + instanceLabel: 0 #控制指标是否保留instance标签信息 0 不保留 1 保留 ymlPath: F:/prometheus.yml ruleYmlPath: F:/rule.yml snmpYmlPath: F:/snmp.yml |