Agent/tr-agent-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

交换机采集数据优化

Browse Source
This commit is contained in:
qiminbao
2025-09-26 15:03:48 +08:00
parent b07abc881d
commit 6c098b3950
1 changed files with 95 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/tongran/agent/client/netty/enpoint/AgentEndpoint.java
+95 -68
View File
@@ -60,93 +60,118 @@ public class AgentEndpoint {
} }
if(jsonObject.containsKey("netOID")){ if(jsonObject.containsKey("netOID")){
String netOID = jsonObject.getString("netOID"); String netOID = jsonObject.getString("netOID");
LinkedHashMap<String, String> map = JSON.parseObject(netOID, new TypeReference<LinkedHashMap<String, String>>() {}); if(StringUtils.isNotBlank(netOID)){
GlobalConfig.SWITCH_NET_OID = map; LinkedHashMap<String, String> map = JSON.parseObject(netOID, new TypeReference<LinkedHashMap<String, String>>() {});
LinkedHashMap<String,String> m = AgentUtil.swapMap(map); GlobalConfig.SWITCH_NET_OID = map;
if(m.containsKey(GlobalConfig.NET_INDEX_PARAM)){ LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
GlobalConfig.NET_INDEX_OID = m.get(GlobalConfig.NET_INDEX_PARAM); if(m.containsKey(GlobalConfig.NET_INDEX_PARAM)){
GlobalConfig.NET_INDEX_OID = m.get(GlobalConfig.NET_INDEX_PARAM);
}
} }
} }
if(jsonObject.containsKey("moduleOID")){ if(jsonObject.containsKey("moduleOID")){
String moduleOID = jsonObject.getString("moduleOID"); String moduleOID = jsonObject.getString("moduleOID");
LinkedHashMap<String, String> map = JSON.parseObject(moduleOID, new TypeReference<LinkedHashMap<String, String>>() {}); if(StringUtils.isNotBlank(moduleOID)){
GlobalConfig.SWITCH_MODULE_OID = map; LinkedHashMap<String, String> map = JSON.parseObject(moduleOID, new TypeReference<LinkedHashMap<String, String>>() {});
LinkedHashMap<String,String> m = AgentUtil.swapMap(map); GlobalConfig.SWITCH_MODULE_OID = map;
if(m.containsKey(GlobalConfig.MODULE_INDEX_PARAM)){ LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
GlobalConfig.MODULE_INDEX_OID = m.get(GlobalConfig.MODULE_INDEX_PARAM); if(m.containsKey(GlobalConfig.MODULE_INDEX_PARAM)){
GlobalConfig.MODULE_INDEX_OID = m.get(GlobalConfig.MODULE_INDEX_PARAM);
}
} }
} }
if(jsonObject.containsKey("mpuOID")){ if(jsonObject.containsKey("mpuOID")){
String mpuOID = jsonObject.getString("mpuOID"); String mpuOID = jsonObject.getString("mpuOID");
LinkedHashMap<String, String> map = JSON.parseObject(mpuOID, new TypeReference<LinkedHashMap<String, String>>() {}); if(StringUtils.isNotBlank(mpuOID)){
GlobalConfig.SWITCH_MPU_OID = map; LinkedHashMap<String, String> map = JSON.parseObject(mpuOID, new TypeReference<LinkedHashMap<String, String>>() {});
LinkedHashMap<String,String> m = AgentUtil.swapMap(map); GlobalConfig.SWITCH_MPU_OID = map;
if(m.containsKey(GlobalConfig.MPU_INDEX_PARAM)){ LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
GlobalConfig.MPU_INDEX_OID = m.get(GlobalConfig.MPU_INDEX_PARAM); if(m.containsKey(GlobalConfig.MPU_INDEX_PARAM)){
GlobalConfig.MPU_INDEX_OID = m.get(GlobalConfig.MPU_INDEX_PARAM);
}
} }
} }
if(jsonObject.containsKey("pwrOID")){ if(jsonObject.containsKey("pwrOID")){
String pwrOID = jsonObject.getString("pwrOID"); String pwrOID = jsonObject.getString("pwrOID");
LinkedHashMap<String, String> map = JSON.parseObject(pwrOID, new TypeReference<LinkedHashMap<String, String>>() {}); if(StringUtils.isNotBlank(pwrOID)){
GlobalConfig.SWITCH_PWR_OID = map; LinkedHashMap<String, String> map = JSON.parseObject(pwrOID, new TypeReference<LinkedHashMap<String, String>>() {});
LinkedHashMap<String,String> m = AgentUtil.swapMap(map); GlobalConfig.SWITCH_PWR_OID = map;
if(m.containsKey(GlobalConfig.PWR_INDEX_PARAM)){ LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
GlobalConfig.PWR_INDEX_OID = m.get(GlobalConfig.PWR_INDEX_PARAM); if(m.containsKey(GlobalConfig.PWR_INDEX_PARAM)){
GlobalConfig.PWR_INDEX_OID = m.get(GlobalConfig.PWR_INDEX_PARAM);
}
} }
} }
if(jsonObject.containsKey("fanOID")){ if(jsonObject.containsKey("fanOID")){
String fanOID = jsonObject.getString("fanOID"); String fanOID = jsonObject.getString("fanOID");
LinkedHashMap<String, String> map = JSON.parseObject(fanOID, new TypeReference<LinkedHashMap<String, String>>() {}); if(StringUtils.isNotBlank(fanOID)){
GlobalConfig.SWITCH_FAN_OID = map; LinkedHashMap<String, String> map = JSON.parseObject(fanOID, new TypeReference<LinkedHashMap<String, String>>() {});
LinkedHashMap<String,String> m = AgentUtil.swapMap(map); GlobalConfig.SWITCH_FAN_OID = map;
if(m.containsKey(GlobalConfig.FAN_INDEX_PARAM)){ LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
GlobalConfig.FAN_INDEX_OID = m.get(GlobalConfig.FAN_INDEX_PARAM); if(m.containsKey(GlobalConfig.FAN_INDEX_PARAM)){
GlobalConfig.FAN_INDEX_OID = m.get(GlobalConfig.FAN_INDEX_PARAM);
}
} }
} }
if(jsonObject.containsKey("otherOID")){ if(jsonObject.containsKey("otherOID")){
String otherOID = jsonObject.getString("otherOID"); String otherOID = jsonObject.getString("otherOID");
LinkedHashMap<String, String> map = JSON.parseObject(otherOID, new TypeReference<LinkedHashMap<String, String>>() {}); if(StringUtils.isNotBlank(otherOID)){
GlobalConfig.SWITCH_OTHER_OID = map; LinkedHashMap<String, String> map = JSON.parseObject(otherOID, new TypeReference<LinkedHashMap<String, String>>() {});
LinkedHashMap<String,String> m = AgentUtil.swapMap(map); GlobalConfig.SWITCH_OTHER_OID = map;
if(m.containsKey(GlobalConfig.OTHER_INDEX_PARAM)){ LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
GlobalConfig.OTHER_INDEX_OID = m.get(GlobalConfig.OTHER_INDEX_PARAM); if(m.containsKey(GlobalConfig.OTHER_INDEX_PARAM)){
GlobalConfig.OTHER_INDEX_OID = m.get(GlobalConfig.OTHER_INDEX_PARAM);
}
} }
} }
if(jsonObject.containsKey("filters")){ if(jsonObject.containsKey("filters")){
String filters = jsonObject.getString("filters"); String filters = jsonObject.getString("filters");
JSONObject object = JSONObject.parseObject(filters); if(StringUtils.isNotBlank(filters)){
JSONObject object = JSONObject.parseObject(filters);
if(object.containsKey("netOID")){ if(object.containsKey("netOID")){
String netOID = object.getString("netOID"); String netOID = object.getString("netOID");
List<String> list = JSON.parseObject(netOID, new TypeReference<List<String>>() {}); if(StringUtils.isNotBlank(netOID)){
GlobalConfig.NET_FILTER = list; List<String> list = JSON.parseObject(netOID, new TypeReference<List<String>>() {});
GlobalConfig.NET_FILTER = list;
}
}
if(object.containsKey("moduleOID")){
String moduleOID = object.getString("moduleOID");
if(StringUtils.isNotBlank(moduleOID)){
List<String> list = JSON.parseObject(moduleOID, new TypeReference<List<String>>() {});
GlobalConfig.MODULE_FILTER = list;
}
}
if(object.containsKey("mpuOID")){
String mpuOID = object.getString("mpuOID");
if(StringUtils.isNotBlank(mpuOID)){
List<String> list = JSON.parseObject(mpuOID, new TypeReference<List<String>>() {});
GlobalConfig.MPU_FILTER = list;
}
}
if(object.containsKey("pwrOID")){
String pwrOID = object.getString("pwrOID");
if(StringUtils.isNotBlank(pwrOID)){
List<String> list = JSON.parseObject(pwrOID, new TypeReference<List<String>>() {});
GlobalConfig.PWR_FILTER = list;
}
}
if(object.containsKey("fanOID")){
String fanOID = object.getString("fanOID");
if(StringUtils.isNotBlank(fanOID)){
List<String> list = JSON.parseObject(fanOID, new TypeReference<List<String>>() {});
GlobalConfig.FAN_FILTER = list;
}
}
if(object.containsKey("otherOID")){
String otherOID = object.getString("otherOID");
if(StringUtils.isNotBlank(otherOID)){
List<String> list = JSON.parseObject(otherOID, new TypeReference<List<String>>() {});
GlobalConfig.OTHER_FILTER = list;
}
}
} }
if(object.containsKey("moduleOID")){
String moduleOID = object.getString("moduleOID");
List<String> list = JSON.parseObject(moduleOID, new TypeReference<List<String>>() {});
GlobalConfig.MODULE_FILTER = list;
}
if(object.containsKey("mpuOID")){
String mpuOID = object.getString("mpuOID");
List<String> list = JSON.parseObject(mpuOID, new TypeReference<List<String>>() {});
GlobalConfig.MPU_FILTER = list;
}
if(object.containsKey("pwrOID")){
String pwrOID = object.getString("pwrOID");
List<String> list = JSON.parseObject(pwrOID, new TypeReference<List<String>>() {});
GlobalConfig.PWR_FILTER = list;
}
if(object.containsKey("fanOID")){
String fanOID = object.getString("fanOID");
List<String> list = JSON.parseObject(fanOID, new TypeReference<List<String>>() {});
GlobalConfig.FAN_FILTER = list;
}
if(object.containsKey("otherOID")){
String otherOID = object.getString("otherOID");
List<String> list = JSON.parseObject(otherOID, new TypeReference<List<String>>() {});
GlobalConfig.OTHER_FILTER = list;
}
} }
} }
@@ -266,12 +291,14 @@ public class AgentEndpoint {
JSONObject jsonObject = JSONObject.parseObject(data); JSONObject jsonObject = JSONObject.parseObject(data);
if(jsonObject.containsKey("alarms")){ if(jsonObject.containsKey("alarms")){
String alarms = jsonObject.getString("alarms"); String alarms = jsonObject.getString("alarms");
AssertLog.info("告警设置,alarms={}", alarms); if(StringUtils.isNotBlank(alarms)){
GlobalConfig.ALARM_LIST = JSON.parseObject(alarms, new TypeReference<List<AlarmEO>>() {}); AssertLog.info("告警设置,alarms={}", alarms);
AssertLog.info("告警设置,监控项={}", JSON.toJSONString(GlobalConfig.ALARM_LIST)); GlobalConfig.ALARM_LIST = JSON.parseObject(alarms, new TypeReference<List<AlarmEO>>() {});
if(CollectionUtil.isNotEmpty(GlobalConfig.ALARM_LIST)){ AssertLog.info("告警设置,监控项={}", JSON.toJSONString(GlobalConfig.ALARM_LIST));
AssertLog.info("告警设置,is_alarm={}", AgentDataUtil.hasAnyActiveAlarm(GlobalConfig.ALARM_LIST)); if(CollectionUtil.isNotEmpty(GlobalConfig.ALARM_LIST)){
GlobalConfig.IS_ALARM = AgentDataUtil.hasAnyActiveAlarm(GlobalConfig.ALARM_LIST); AssertLog.info("告警设置,is_alarm={}", AgentDataUtil.hasAnyActiveAlarm(GlobalConfig.ALARM_LIST));
GlobalConfig.IS_ALARM = AgentDataUtil.hasAnyActiveAlarm(GlobalConfig.ALARM_LIST);
}
} }
} }
agentService.alarmMonitor(); agentService.alarmMonitor();