gfwleak/galaxy-tsg-olap-generate-baseline
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复多攻击类型多线程时OriginalData为空问题

Browse Source
This commit is contained in:
yinjiangyi
2021-08-02 14:13:50 +08:00
parent 2ff29dac6c
commit 857474babc
5 changed files with 72 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
logs/ddos_baselines.log
View File

File diff suppressed because one or more lines are too long

5
src/main/java/cn/mesalab/service/BaselineGeneration.java
View File

@@ -28,7 +28,6 @@ public class BaselineGeneration {
private static DruidData druidData; private static DruidData druidData;
private static HbaseUtils hbaseUtils; private static HbaseUtils hbaseUtils;
private static Table hbaseTable; private static Table hbaseTable;
private static List<Map<String, Object>> batchDruidData = new ArrayList<>(); private static List<Map<String, Object>> batchDruidData = new ArrayList<>();
private static final Integer BASELINE_POINT_NUM = ApplicationConfig.BASELINE_RANGE_DAYS * 24 * (60/ApplicationConfig.HISTORICAL_GRAD); private static final Integer BASELINE_POINT_NUM = ApplicationConfig.BASELINE_RANGE_DAYS * 24 * (60/ApplicationConfig.HISTORICAL_GRAD);
@@ -44,7 +43,7 @@ public class BaselineGeneration {
try{ try{
generateBaselinesThread(ApplicationConfig.DRUID_ATTACKTYPE_TCP_SYN_FLOOD); generateBaselinesThread(ApplicationConfig.DRUID_ATTACKTYPE_TCP_SYN_FLOOD);
// generateBaselines(ApplicationConfig.DRUID_ATTACKTYPE_UDP_FLOOD); generateBaselines(ApplicationConfig.DRUID_ATTACKTYPE_UDP_FLOOD);
// generateBaselines(ApplicationConfig.DRUID_ATTACKTYPE_ICMP_FLOOD); // generateBaselines(ApplicationConfig.DRUID_ATTACKTYPE_ICMP_FLOOD);
// generateBaselines(ApplicationConfig.DRUID_ATTACKTYPE_DNS_AMPL); // generateBaselines(ApplicationConfig.DRUID_ATTACKTYPE_DNS_AMPL);
@@ -86,8 +85,10 @@ public class BaselineGeneration {
for (int batchCurrent = 0; batchCurrent <batchCount; batchCurrent++){ for (int batchCurrent = 0; batchCurrent <batchCount; batchCurrent++){
List<String> batchIps = destinationIps.subList(batchCurrent*ApplicationConfig.GENERATE_BATCH_NUM, List<String> batchIps = destinationIps.subList(batchCurrent*ApplicationConfig.GENERATE_BATCH_NUM,
(batchCurrent+1)*ApplicationConfig.GENERATE_BATCH_NUM); (batchCurrent+1)*ApplicationConfig.GENERATE_BATCH_NUM);
if(batchIps.size()>0){
executor.execute(() -> generateBaselines(batchIps, attackType)); executor.execute(() -> generateBaselines(batchIps, attackType));
} }
}
executor.shutdown(); executor.shutdown();
executor.awaitTermination(10L, TimeUnit.SECONDS); executor.awaitTermination(10L, TimeUnit.SECONDS);

2
src/main/resources/application.properties
View File

@@ -6,7 +6,7 @@ druid.table=top_server_ip_test_log
#字段映射 #字段映射
druid.attacktype.tcpsynflood=sessions druid.attacktype.tcpsynflood=sessions
#druid.attacktype.udpflood=IPv6_TCP druid.attacktype.udpflood=bytes
#druid.attacktype.icmpflood=IPv6_UDP #druid.attacktype.icmpflood=IPv6_UDP
#druid.attacktype.dnsamplification=IPv4_UDP #druid.attacktype.dnsamplification=IPv4_UDP
druid.serverip.columnname=destination druid.serverip.columnname=destination

2
target/classes/application.properties
View File

@@ -6,7 +6,7 @@ druid.table=top_server_ip_test_log
#字段映射 #字段映射
druid.attacktype.tcpsynflood=sessions druid.attacktype.tcpsynflood=sessions
#druid.attacktype.udpflood=IPv6_TCP druid.attacktype.udpflood=bytes
#druid.attacktype.icmpflood=IPv6_UDP #druid.attacktype.icmpflood=IPv6_UDP
#druid.attacktype.dnsamplification=IPv4_UDP #druid.attacktype.dnsamplification=IPv4_UDP
druid.serverip.columnname=destination druid.serverip.columnname=destination

BIN
target/classes/cn/mesalab/service/BaselineGeneration.class
View File

Binary file not shown.