From f625cdd1669165f092448dd8847086dffbf336e3 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Wed, 3 Jan 2018 17:24:47 +0800 Subject: [PATCH] Alarm test ok. --- .../provider/AnalysisAlarmModuleProvider.java | 4 +++ ...rviceReferenceMetricAlarmAssertWorker.java | 4 +++ .../define/graph/MetricWorkerIdDefine.java | 7 +++-- .../application/ApplicationMetricGraph.java | 28 +++++++++++++++++-- .../service/ApplicationAlarmRuleConfig.java | 2 +- .../ApplicationReferenceAlarmRuleConfig.java | 2 +- .../service/InstanceAlarmRuleConfig.java | 2 +- .../InstanceReferenceAlarmRuleConfig.java | 2 +- .../service/ServiceAlarmRuleConfig.java | 2 +- .../ServiceReferenceAlarmRuleConfig.java | 2 +- 10 files changed, 44 insertions(+), 11 deletions(-) diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java index 83cc30a6ce..9c560ff4a2 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java @@ -28,6 +28,7 @@ import org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.servic import org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.service.ServiceReferenceMetricAlarmGraph; import org.apache.skywalking.apm.collector.analysis.metric.define.AnalysisMetricModule; import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCreateListener; +import org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer; import org.apache.skywalking.apm.collector.configuration.ConfigurationModule; import org.apache.skywalking.apm.collector.core.module.Module; import org.apache.skywalking.apm.collector.core.module.ModuleProvider; @@ -72,6 +73,9 @@ public class AnalysisAlarmModuleProvider extends ModuleProvider { ApplicationReferenceMetricAlarmGraph applicationReferenceMetricAlarmGraph = new ApplicationReferenceMetricAlarmGraph(getManager(), workerCreateListener); applicationReferenceMetricAlarmGraph.create(); + + PersistenceTimer persistenceTimer = new PersistenceTimer(AnalysisAlarmModule.NAME); + persistenceTimer.start(getManager(), workerCreateListener.getPersistenceWorkers()); } @Override public void notifyAfterCompleted() throws ServiceNotProvidedException { diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmAssertWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmAssertWorker.java index cbf0cc97cb..f1d22bd150 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmAssertWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmAssertWorker.java @@ -27,12 +27,16 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.Const; import org.apache.skywalking.apm.collector.storage.table.alarm.ServiceReferenceAlarm; import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author peng-yongsheng */ public class ServiceReferenceMetricAlarmAssertWorker extends AlarmAssertWorker { + private final Logger logger = LoggerFactory.getLogger(ServiceReferenceMetricAlarmAssertWorker.class); + private final IServiceReferenceAlarmRuleConfig serviceReferenceAlarmRuleConfig; public ServiceReferenceMetricAlarmAssertWorker(ModuleManager moduleManager) { diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/graph/MetricWorkerIdDefine.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/graph/MetricWorkerIdDefine.java index a4d37901e7..1bf1261589 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/graph/MetricWorkerIdDefine.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/graph/MetricWorkerIdDefine.java @@ -65,8 +65,9 @@ public class MetricWorkerIdDefine { public static final int APPLICATION_REFERENCE_GRAPH_BRIDGE_WORKER_ID = 430; public static final int SERVICE_METRIC_GRAPH_BRIDGE_WORKER_ID = 431; public static final int INSTANCE_METRIC_GRAPH_BRIDGE_WORKER_ID = 432; + public static final int APPLICATION_METRIC_GRAPH_BRIDGE_WORKER_ID = 433; - public static final int INSTANCE_MAPPING_AGGREGATION_WORKER_ID = 433; - public static final int INSTANCE_MAPPING_REMOTE_WORKER_ID = 434; - public static final int INSTANCE_MAPPING_PERSISTENCE_WORKER_ID = 435; + public static final int INSTANCE_MAPPING_AGGREGATION_WORKER_ID = 434; + public static final int INSTANCE_MAPPING_REMOTE_WORKER_ID = 435; + public static final int INSTANCE_MAPPING_PERSISTENCE_WORKER_ID = 436; } diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationMetricGraph.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationMetricGraph.java index 36e255052f..c6b91ed91e 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationMetricGraph.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationMetricGraph.java @@ -19,8 +19,12 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricGraphIdDefine; +import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCreateListener; +import org.apache.skywalking.apm.collector.core.graph.Graph; import org.apache.skywalking.apm.collector.core.graph.GraphManager; +import org.apache.skywalking.apm.collector.core.graph.Next; +import org.apache.skywalking.apm.collector.core.graph.NodeProcessor; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.remote.RemoteModule; import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService; @@ -42,9 +46,29 @@ public class ApplicationMetricGraph { public void create() { RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class); - GraphManager.INSTANCE.createIfAbsent(MetricGraphIdDefine.APPLICATION_METRIC_GRAPH_ID, ApplicationReferenceMetric.class) - .addNode(new ApplicationMetricAggregationWorker.Factory(moduleManager).create(workerCreateListener)) + Graph graph = GraphManager.INSTANCE.createIfAbsent(MetricGraphIdDefine.APPLICATION_METRIC_GRAPH_ID, ApplicationReferenceMetric.class); + + graph.addNode(new ApplicationMetricAggregationWorker.Factory(moduleManager).create(workerCreateListener)) .addNext(new ApplicationMetricRemoteWorker.Factory(moduleManager, remoteSenderService, MetricGraphIdDefine.APPLICATION_METRIC_GRAPH_ID).create(workerCreateListener)) .addNext(new ApplicationMetricPersistenceWorker.Factory(moduleManager).create(workerCreateListener)); + + link(graph); + } + + private void link(Graph graph) { + GraphManager.INSTANCE.findGraph(MetricGraphIdDefine.APPLICATION_REFERENCE_METRIC_GRAPH_ID, ApplicationReferenceMetric.class) + .toFinder().findNode(MetricWorkerIdDefine.APPLICATION_REFERENCE_METRIC_AGGREGATION_WORKER_ID, ApplicationReferenceMetric.class) + .addNext(new NodeProcessor() { + + @Override public int id() { + return MetricWorkerIdDefine.APPLICATION_METRIC_GRAPH_BRIDGE_WORKER_ID; + } + + @Override + public void process(ApplicationReferenceMetric applicationReferenceMetric, + Next next) { + graph.start(applicationReferenceMetric); + } + }); } } diff --git a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ApplicationAlarmRuleConfig.java b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ApplicationAlarmRuleConfig.java index d761818f12..99ae3a5c50 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ApplicationAlarmRuleConfig.java +++ b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ApplicationAlarmRuleConfig.java @@ -36,6 +36,6 @@ public class ApplicationAlarmRuleConfig implements IApplicationAlarmRuleConfig { } @Override public double callerAverageResponseTimeThreshold() { - return 3000; + return 2000; } } diff --git a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ApplicationReferenceAlarmRuleConfig.java b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ApplicationReferenceAlarmRuleConfig.java index 30b301d867..fb073cb68d 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ApplicationReferenceAlarmRuleConfig.java +++ b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ApplicationReferenceAlarmRuleConfig.java @@ -36,6 +36,6 @@ public class ApplicationReferenceAlarmRuleConfig implements IApplicationReferenc } @Override public double callerAverageResponseTimeThreshold() { - return 3000; + return 2000; } } diff --git a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InstanceAlarmRuleConfig.java b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InstanceAlarmRuleConfig.java index f7022729ed..51b019f66c 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InstanceAlarmRuleConfig.java +++ b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InstanceAlarmRuleConfig.java @@ -36,6 +36,6 @@ public class InstanceAlarmRuleConfig implements IInstanceAlarmRuleConfig { } @Override public double callerAverageResponseTimeThreshold() { - return 3000; + return 2000; } } diff --git a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InstanceReferenceAlarmRuleConfig.java b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InstanceReferenceAlarmRuleConfig.java index 51a9de4258..9c07b20c43 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InstanceReferenceAlarmRuleConfig.java +++ b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InstanceReferenceAlarmRuleConfig.java @@ -36,6 +36,6 @@ public class InstanceReferenceAlarmRuleConfig implements IInstanceReferenceAlarm } @Override public double callerAverageResponseTimeThreshold() { - return 3000; + return 2000; } } diff --git a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ServiceAlarmRuleConfig.java b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ServiceAlarmRuleConfig.java index 219de89a48..b2251a3e5f 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ServiceAlarmRuleConfig.java +++ b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ServiceAlarmRuleConfig.java @@ -36,6 +36,6 @@ public class ServiceAlarmRuleConfig implements IServiceAlarmRuleConfig { } @Override public double callerAverageResponseTimeThreshold() { - return 3000; + return 2000; } } diff --git a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ServiceReferenceAlarmRuleConfig.java b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ServiceReferenceAlarmRuleConfig.java index d2245c4cbc..4b9285d759 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ServiceReferenceAlarmRuleConfig.java +++ b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ServiceReferenceAlarmRuleConfig.java @@ -36,6 +36,6 @@ public class ServiceReferenceAlarmRuleConfig implements IServiceReferenceAlarmRu } @Override public double callerAverageResponseTimeThreshold() { - return 3000; + return 2000; } } -- GitLab