kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Alarm test ok.

This commit is contained in:
peng-yongsheng 2018-01-03 17:24:47 +08:00
parent ba0d00c7bc
commit f625cdd166
10 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java
View File

@ -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 {

4
apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmAssertWorker.java
View File

@ -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<ServiceReferenceMetric, ServiceReferenceAlarm> {
private final Logger logger = LoggerFactory.getLogger(ServiceReferenceMetricAlarmAssertWorker.class);
private final IServiceReferenceAlarmRuleConfig serviceReferenceAlarmRuleConfig;
public ServiceReferenceMetricAlarmAssertWorker(ModuleManager moduleManager) {

7
apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/graph/MetricWorkerIdDefine.java
View File

@ -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;
}

28
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationMetricGraph.java
View File

@ -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<ApplicationReferenceMetric> 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<ApplicationReferenceMetric> 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<ApplicationReferenceMetric, ApplicationReferenceMetric>() {
@Override public int id() {
return MetricWorkerIdDefine.APPLICATION_METRIC_GRAPH_BRIDGE_WORKER_ID;
}
@Override
public void process(ApplicationReferenceMetric applicationReferenceMetric,
Next<ApplicationReferenceMetric> next) {
graph.start(applicationReferenceMetric);
}
});
}
}

2
apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ApplicationAlarmRuleConfig.java
View File

@ -36,6 +36,6 @@ public class ApplicationAlarmRuleConfig implements IApplicationAlarmRuleConfig {
}
@Override public double callerAverageResponseTimeThreshold() {
return 3000;
return 2000;
}
}

2
apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ApplicationReferenceAlarmRuleConfig.java
View File

@ -36,6 +36,6 @@ public class ApplicationReferenceAlarmRuleConfig implements IApplicationReferenc
}
@Override public double callerAverageResponseTimeThreshold() {
return 3000;
return 2000;
}
}

2
apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InstanceAlarmRuleConfig.java
View File

@ -36,6 +36,6 @@ public class InstanceAlarmRuleConfig implements IInstanceAlarmRuleConfig {
}
@Override public double callerAverageResponseTimeThreshold() {
return 3000;
return 2000;
}
}

2
apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InstanceReferenceAlarmRuleConfig.java
View File

@ -36,6 +36,6 @@ public class InstanceReferenceAlarmRuleConfig implements IInstanceReferenceAlarm
}
@Override public double callerAverageResponseTimeThreshold() {
return 3000;
return 2000;
}
}

2
apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ServiceAlarmRuleConfig.java
View File

@ -36,6 +36,6 @@ public class ServiceAlarmRuleConfig implements IServiceAlarmRuleConfig {
}
@Override public double callerAverageResponseTimeThreshold() {
return 3000;
return 2000;
}
}

2
apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ServiceReferenceAlarmRuleConfig.java
View File

@ -36,6 +36,6 @@ public class ServiceReferenceAlarmRuleConfig implements IServiceReferenceAlarmRu
}
@Override public double callerAverageResponseTimeThreshold() {
return 3000;
return 2000;
}
}