diff --git a/server/home/home-alert/src/main/java/io/holoinsight/server/home/alert/service/calculate/AbstractUniformInspectRunningRule.java b/server/home/home-alert/src/main/java/io/holoinsight/server/home/alert/service/calculate/AbstractUniformInspectRunningRule.java index 2b53a68a3..770035f69 100644 --- a/server/home/home-alert/src/main/java/io/holoinsight/server/home/alert/service/calculate/AbstractUniformInspectRunningRule.java +++ b/server/home/home-alert/src/main/java/io/holoinsight/server/home/alert/service/calculate/AbstractUniformInspectRunningRule.java @@ -51,7 +51,7 @@ public class AbstractUniformInspectRunningRule { LoggerFactory.getLogger(AbstractUniformInspectRunningRule.class); ThreadPoolExecutor ruleRunner = new ThreadPoolExecutor(20, 100, 10, TimeUnit.SECONDS, - new ArrayBlockingQueue<>(1000), r -> new Thread(r, "RuleRunner")); + new ArrayBlockingQueue<>(2000), r -> new Thread(r, "RuleRunner")); @Autowired private NullValueTracker nullValueTracker; @@ -155,6 +155,8 @@ public EventInfo runRule(InspectConfig inspectConfig, long period, ComputeInfo computeInfo = ComputeInfo.getComputeInfo(inspectConfig, period); List triggerResults = new CopyOnWriteArrayList<>(); CountDownLatch latch = new CountDownLatch(parallelSize); + logger.info("ALERT_CONCURRENT_MONITOR,size={},rule={}", parallelSize, + inspectConfig.getUniqueId()); for (DataResult dataResult : dataResultList) { ruleRunner.execute(() -> { try { diff --git a/server/home/home-facade/src/main/java/io/holoinsight/server/home/facade/AlertTemplateField.java b/server/home/home-facade/src/main/java/io/holoinsight/server/home/facade/AlertTemplateField.java index c00d33b9f..f1cb56209 100644 --- a/server/home/home-facade/src/main/java/io/holoinsight/server/home/facade/AlertTemplateField.java +++ b/server/home/home-facade/src/main/java/io/holoinsight/server/home/facade/AlertTemplateField.java @@ -44,6 +44,9 @@ public enum AlertTemplateField { ALERT_TRIGGER_CONDITION("ALERT_TRIGGER_CONDITION", "告警触发条件", "string"), // SOURCE_TYPE("SOURCE_TYPE", "告警来源类型", "string"), // LOG_CONTENT("LOG_CONTENT", "告警来源日志采样内容", "string"), // + TENANT_NAME("TENANT_NAME", "租户名", "string"), // + WORKSPACE_NAME("WORKSPACE_NAME", "工作空间名", "string"), // + PID("PID", "pid", "string"), // ;