fix: 更新relabel_configs配置 新增metric_relabel_configs配置

1 files changed, 22 insertions, 7 deletions

diff --git a/src/main/java/com/nis/job/ConfagentJob.java b/src/main/java/com/nis/job/ConfagentJob.java
index b7b3a72..79470cc 100644
--- a/src/main/java/com/nis/job/ConfagentJob.java
+++ b/src/main/java/com/nis/job/ConfagentJob.java
@@ -179,7 +179,7 @@ public class ConfagentJob extends QuartzJobBean {
 					Map job2 = new HashMap();

 					job2.put("targets",list);

 					Map job3 = new HashMap();

-					job3.put("dc", endpointInfos.get(m).getIdc().getName());

+					job3.put("datacenter", endpointInfos.get(m).getIdc().getName());

 					job3.put("project", endpointInfos.get(m).getProject().getName());

 					job3.put("asset",endpointInfos.get(m).getAsset().getHost());

 					job3.put("module",endpointInfos.get(m).getModule().getName());

@@ -189,15 +189,30 @@ public class ConfagentJob extends QuartzJobBean {
 					list2.add(job2);

 					job.put("static_configs", list2);

 					

+					// 配置relabel_config

 					List list3=new ArrayList();

-					Map job4=new HashMap();

-					job4.put("source_labels", "__address__");

-					job4.put("regex", "(.*)");

+					Map job4=new LinkedHashMap();

+					job4.put("source_labels", "[job]");

+					job4.put("regex", "(.+)");

 					job4.put("target_label", "endpoint");

-					job4.put("action", "replace");

-					job4.put("replacement", "$1");

+					Map job5=new HashMap();

+					job5.put("regex", "job");

+					job5.put("action", "labeldrop");

+					Map job6=new HashMap();

+					job6.put("regex", "instance");

+					job6.put("action", "labeldrop");

 					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_confgis", list4);

 					if(StringUtils.isNotBlank(type)&&type.equals(ModuleTypeEnum.HTTP.getValue())) {

 						//处理endpoint中param字段json串 请求参数

 						String param = endpointInfos.get(m).getParam();

@@ -235,7 +250,7 @@ public class ConfagentJob extends QuartzJobBean {
 				}

 			}

 			//将promserver和处理的endpoint对应关系储存到redis

-//			savePromeserverInfoToRedis(promserver,subs);

+			savePromeserverInfoToRedis(promserver,subs);

 		}

 		logger.info("subHandle : result : {} ",JSON.toJSON(result));

 		return result;